dm: reject trailing characters in sccanf input

Device mapper uses sscanf to convert arguments to numbers. The problem is that
the way we use it ignores additional unmatched characters in the scanned string.

For example, this `if (sscanf(string, "%d", &number) == 1)' will match a number,
but also it will match number with some garbage appended, like "123abc".

As a result, device mapper accepts garbage after some numbers. For example
the command `dmsetup create vg1-new --table "0 16384 linear 254:1bla 34816bla"'
will pass without an error.

This patch fixes all sscanf uses in device mapper. It appends "%c" with
a pointer to a dummy character variable to every sscanf statement.

The construct `if (sscanf(string, "%d%c", &number, &dummy) == 1)' succeeds
only if string is a null-terminated number (optionally preceded by some
whitespace characters). If there is some character appended after the number,
sscanf matches "%c", writes the character to the dummy variable and returns 2.
We check the return value for 1 and consequently reject numbers with some
garbage appended.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 9bfd057be686..d039de8322f0 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -924,8 +924,9 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                       unsigned int mirror, char **argv)
 {
         unsigned long long offset;
+        char dummy;
 
-        if (sscanf(argv[1], "%llu", &offset) != 1) {
+        if (sscanf(argv[1], "%llu%c", &offset, &dummy) != 1) {
                 ti->error = "Invalid offset";
                 return -EINVAL;
         }
@@ -953,13 +954,14 @@ static struct dm_dirty_log *create_dirty_log(struct dm_target *ti,
 {
         unsigned param_count;
         struct dm_dirty_log *dl;
+        char dummy;
 
         if (argc < 2) {
                 ti->error = "Insufficient mirror log arguments";
                 return NULL;
         }
 
-        if (sscanf(argv[1], "%u", &param_count) != 1) {
+        if (sscanf(argv[1], "%u%c", &param_count, &dummy) != 1) {
                 ti->error = "Invalid mirror log argument count";
                 return NULL;
         }
@@ -986,13 +988,14 @@ static int parse_features(struct mirror_set *ms, unsigned argc, char **argv,
 {
         unsigned num_features;
         struct dm_target *ti = ms->ti;
+        char dummy;
 
         *args_used = 0;
 
         if (!argc)
                 return 0;
 
-        if (sscanf(argv[0], "%u", &num_features) != 1) {
+        if (sscanf(argv[0], "%u%c", &num_features, &dummy) != 1) {
                 ti->error = "Invalid number of features";
                 return -EINVAL;
         }
@@ -1036,6 +1039,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         unsigned int nr_mirrors, m, args_used;
         struct mirror_set *ms;
         struct dm_dirty_log *dl;
+        char dummy;
 
         dl = create_dirty_log(ti, argc, argv, &args_used);
         if (!dl)
@@ -1044,7 +1048,7 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         argv += args_used;
         argc -= args_used;
 
-        if (!argc || sscanf(argv[0], "%u", &nr_mirrors) != 1 ||
+        if (!argc || sscanf(argv[0], "%u%c", &nr_mirrors, &dummy) != 1 ||
             nr_mirrors < 2 || nr_mirrors > DM_KCOPYD_MAX_REGIONS + 1) {
                 ti->error = "Invalid number of mirrors";
                 dm_dirty_log_destroy(dl);