diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-11 13:53:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-14 07:03:15 -0400 |
| commit | 2068cea1731c7ec22a37acc0942357bf3b389001 (patch) | |
| tree | 8908ad04476891bbbe948aaa99cf727c22a01518 /common | |
| parent | 9597494ebfb60418e8a0e7565cca2b7d25512bf5 (diff) | |
| download | u-boot-imx-2068cea1731c7ec22a37acc0942357bf3b389001.zip u-boot-imx-2068cea1731c7ec22a37acc0942357bf3b389001.tar.gz u-boot-imx-2068cea1731c7ec22a37acc0942357bf3b389001.tar.bz2 | |
Use map_sysmem when accessing memory in setexpr
The setexpr command used to segfault when accessing memory in sandbox.
The pointer accesses should be mapped.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_setexpr.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index 926339b..e7194fc 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -12,23 +12,37 @@ #include <common.h> #include <config.h> #include <command.h> +#include <mapmem.h> static ulong get_arg(char *s, int w) { - ulong *p; - /* - * if the parameter starts with a '*' then assume - * it is a pointer to the value we want + * If the parameter starts with a '*' then assume it is a pointer to + * the value we want. */ - if (s[0] == '*') { - p = (ulong *)simple_strtoul(&s[1], NULL, 16); + ulong *p; + ulong addr; + ulong val; + + addr = simple_strtoul(&s[1], NULL, 16); switch (w) { - case 1: return((ulong)(*(uchar *)p)); - case 2: return((ulong)(*(ushort *)p)); + case 1: + p = map_sysmem(addr, sizeof(uchar)); + val = (ulong)*(uchar *)p; + unmap_sysmem(p); + return val; + case 2: + p = map_sysmem(addr, sizeof(ushort)); + val = (ulong)*(ushort *)p; + unmap_sysmem(p); + return val; case 4: - default: return(*p); + default: + p = map_sysmem(addr, sizeof(ulong)); + val = *p; + unmap_sysmem(p); + return val; } } else { return simple_strtoul(s, NULL, 16); |