quota: fix generic/244 on 32-bit platforms
authorTheodore Ts'o <tytso@mit.edu>
Mon, 4 Jul 2016 14:09:48 +0000 (10:09 -0400)
committerEryu Guan <eguan@redhat.com>
Tue, 5 Jul 2016 07:03:06 +0000 (15:03 +0800)
The test program src/test-nextquota.c relies on atoi() to convert a
string to an *unsigned* int.  If the string represents an integer
which is greater than INT_MAX, it is undefined how atoi(3) works,
and it turns out that:

       uint id = atoi("2147483649");

results in id == 2147483649 on x86_64, and id == 2147483647 on a
32-bit x86 platform.

So use strtoul(3) instead, which is portable and technically correct

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
src/test-nextquota.c

index a2bbad97934fc0be9addc6fe5692257a530ba93b..3baa296e1f5fceb27c297548f9e0b7c3278227d4 100644 (file)
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
        int verbose = 0;
        uint id = 0, idflag = 0;
        char *device = NULL;
+       char *tmp;
        struct nextdqblk dqb;
        struct fs_disk_quota xqb;
 
@@ -92,7 +93,11 @@ int main(int argc, char *argv[])
                        typeflag++;
                        break;
                case 'i':
-                       id = atoi(optarg);
+                       id = (uint) strtoul(optarg, &tmp, 0);
+                       if (*tmp) {
+                               fprintf(stderr, "Bad id: %s\n", optarg);
+                               exit(1);
+                       }
                        idflag++;
                        break;
                case 'd':