| Message ID | 1569317550-22731-4-git-send-email-philippe.reynes@softathome.com |
|---|---|
| State | Accepted |
| Commit | ed7ea058a904a0db5c007039adfa79d27da5bcde |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | pytest: add a simple test to check the command aes | expand |
On Tue, 24 Sep 2019 at 02:32, Philippe Reynes <philippe.reynes@softathome.com> wrote: > > 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> > --- > cmd/aes.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> I don't see change logs on these patches. Do you use patman? Regards, SImon
On Tue, 24 Sep 2019 at 02:32, Philippe Reynes <philippe.reynes@softathome.com> wrote: > > 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> > --- > cmd/aes.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> I don't see change logs on these patches. Do you use patman? Regards, SImon Applied to u-boot-dm/next, thanks!
diff --git a/cmd/aes.c b/cmd/aes.c index 7ff4a71..8c61cee 100644 --- a/cmd/aes.c +++ b/cmd/aes.c @@ -11,6 +11,7 @@ #include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> +#include <mapmem.h> /** * 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); len = simple_strtoul(argv[6], NULL, 16); - key_ptr = (uint8_t *)key_addr; - iv_ptr = (uint8_t *)iv_addr; - src_ptr = (uint8_t *)src_addr; - dst_ptr = (uint8_t *)dst_addr; + key_ptr = (uint8_t *)map_sysmem(key_addr, 128 / 8); + iv_ptr = (uint8_t *)map_sysmem(iv_addr, 128 / 8); + src_ptr = (uint8_t *)map_sysmem(src_addr, len); + dst_ptr = (uint8_t *)map_sysmem(dst_addr, len); /* First we expand the key. */ 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_blocks); + unmap_sysmem(key_ptr); + unmap_sysmem(iv_ptr); + unmap_sysmem(src_ptr); + unmap_sysmem(dst_ptr); + return 0; }
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> --- cmd/aes.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)