1 files changed, 24 insertions, 8 deletions

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index d1096fed5a62..adf8cb045b9e 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -272,7 +272,10 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 case Opt_resize:
                 {
                         char *resize = args[0].from;
-                        *newLVSize = simple_strtoull(resize, &resize, 0);
+                        int rc = kstrtoll(resize, 0, newLVSize);
+
+                        if (rc)
+                                goto cleanup;
                         break;
                 }
                 case Opt_resize_nosize:
@@ -326,7 +329,11 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 case Opt_uid:
                 {
                         char *uid = args[0].from;
-                        uid_t val = simple_strtoul(uid, &uid, 0);
+                        uid_t val;
+                        int rc = kstrtouint(uid, 0, &val);
+
+                        if (rc)
+                                goto cleanup;
                         sbi->uid = make_kuid(current_user_ns(), val);
                         if (!uid_valid(sbi->uid))
                                 goto cleanup;
@@ -336,7 +343,11 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 case Opt_gid:
                 {
                         char *gid = args[0].from;
-                        gid_t val = simple_strtoul(gid, &gid, 0);
+                        gid_t val;
+                        int rc = kstrtouint(gid, 0, &val);
+
+                        if (rc)
+                                goto cleanup;
                         sbi->gid = make_kgid(current_user_ns(), val);
                         if (!gid_valid(sbi->gid))
                                 goto cleanup;
@@ -346,7 +357,10 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 case Opt_umask:
                 {
                         char *umask = args[0].from;
-                        sbi->umask = simple_strtoul(umask, &umask, 8);
+                        int rc = kstrtouint(umask, 8, &sbi->umask);
+
+                        if (rc)
+                                goto cleanup;
                         if (sbi->umask & ~0777) {
                                 pr_err("JFS: Invalid value of umask\n");
                                 goto cleanup;
@@ -377,13 +391,15 @@ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
                 {
                         struct request_queue *q = bdev_get_queue(sb->s_bdev);
                         char *minblks_trim = args[0].from;
+                        int rc;
                         if (blk_queue_discard(q)) {
                                 *flag |= JFS_DISCARD;
-                                sbi->minblks_trim = simple_strtoull(
-                                        minblks_trim, &minblks_trim, 0);
-                        } else {
+                                rc = kstrtouint(minblks_trim, 0,
+                                                &sbi->minblks_trim);
+                                if (rc)
+                                        goto cleanup;
+                        } else
                                 pr_err("JFS: discard option not supported on device\n");
-                        }
                         break;
                 }