summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-05-23 16:00:43 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-05-23 16:00:49 +0200
commit300ad58d334d1aaa27c9cf02f0d7792a14dc1828 (patch)
treec6639830d8d6ad35f313d493bc147389d8fd5ac2 /commands
parenta66e38747cb5237a48f323dcef20b99d8ca8a530 (diff)
downloadbarebox-300ad58d334d1aaa27c9cf02f0d7792a14dc1828.tar.gz
commands: mw: Use kstrto*() instead of simple_strtoul()
Now that we have the kstrto*() functions we can use them to detect various errors in passing numbers on the command line. Start with the 'mw' command and make it more robust against illegal numbers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/mw.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/commands/mw.c b/commands/mw.c
index 2912997..3ed6c82 100644
--- a/commands/mw.c
+++ b/commands/mw.c
@@ -63,23 +63,31 @@ static int do_mem_mw(int argc, char *argv[])
u64 val64;
switch (mode) {
case O_RWSIZE_1:
- val8 = simple_strtoul(argv[optind], NULL, 0);
+ ret = kstrtou8(argv[optind], 0, &val8);
+ if (ret)
+ goto illegal_number;
ret = write(fd, &val8, 1);
break;
case O_RWSIZE_2:
- val16 = simple_strtoul(argv[optind], NULL, 0);
+ ret = kstrtou16(argv[optind], 0, &val16);
+ if (ret)
+ goto illegal_number;
if (swab)
val16 = __swab16(val16);
ret = write(fd, &val16, 2);
break;
case O_RWSIZE_4:
- val32 = simple_strtoul(argv[optind], NULL, 0);
+ ret = kstrtou32(argv[optind], 0, &val32);
+ if (ret)
+ goto illegal_number;
if (swab)
val32 = __swab32(val32);
ret = write(fd, &val32, 4);
break;
case O_RWSIZE_8:
- val64 = simple_strtoull(argv[optind], NULL, 0);
+ ret = kstrtou64(argv[optind], 0, &val64);
+ if (ret)
+ goto illegal_number;
if (swab)
val64 = __swab64(val64);
ret = write(fd, &val64, 8);
@@ -96,6 +104,14 @@ static int do_mem_mw(int argc, char *argv[])
close(fd);
return ret ? 1 : 0;
+
+illegal_number:
+ printf("\"%s\" is not a valid %d bit number\n", argv[optind],
+ (mode >> O_RWSIZE_SHIFT) * 8);
+
+ close(fd);
+
+ return 1;
}
BAREBOX_CMD_HELP_START(mw)