dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd: aes: use map_sysmem when accessing memory

Browse Source 
The aes command used to segfault when accessing memory in sandbox.
The pointer accesses should be mapped.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
This commit is contained in:
Philippe Reynes
2019-09-24 11:32:29 +02:00
committed by Simon Glass
parent 5fff9b3bc9
commit ed7ea058a9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/aes.c
View File

@@ -11,6 +11,7 @@
#include <malloc.h> #include <malloc.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <mapmem.h>
/** /**
* do_aes() - Handle the "aes" command-line command * do_aes() - Handle the "aes" command-line command
@@ -46,10 +47,10 @@ static int do_aes(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
dst_addr = simple_strtoul(argv[5], NULL, 16); dst_addr = simple_strtoul(argv[5], NULL, 16);
len = simple_strtoul(argv[6], NULL, 16); len = simple_strtoul(argv[6], NULL, 16);
key_ptr = (uint8_t *)key_addr; key_ptr = (uint8_t *)map_sysmem(key_addr, 128 / 8);
iv_ptr = (uint8_t *)iv_addr; iv_ptr = (uint8_t *)map_sysmem(iv_addr, 128 / 8);
src_ptr = (uint8_t *)src_addr; src_ptr = (uint8_t *)map_sysmem(src_addr, len);
dst_ptr = (uint8_t *)dst_addr; dst_ptr = (uint8_t *)map_sysmem(dst_addr, len);
/* First we expand the key. */ /* First we expand the key. */
aes_expand_key(key_ptr, key_exp); aes_expand_key(key_ptr, key_exp);
@@ -64,6 +65,11 @@ static int do_aes(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
aes_cbc_decrypt_blocks(key_exp, iv_ptr, src_ptr, dst_ptr, aes_cbc_decrypt_blocks(key_exp, iv_ptr, src_ptr, dst_ptr,
aes_blocks); aes_blocks);
unmap_sysmem(key_ptr);
unmap_sysmem(iv_ptr);
unmap_sysmem(src_ptr);
unmap_sysmem(dst_ptr);
return 0; return 0;
} }