Skip to contentSkip to conversation

ext2: fix return values on parse_options() failure

PATCH In review Zhao Hongjiang 4 participants 4 messages Oct 9, 2012 1 message not in the archive ext2 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext2: fix return values on parse_options() failure

From: Zhao Hongjiang <[email protected]>

parse_options() in ext2 should return 0 when parse the mount options fails.

---
 fs/ext2/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext2/super.c +2 -2
index 6c205d0..fa04d02 100644
@@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb)
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb)
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
 			sbi->s_resgid = gid;
 			break;

-- 1.7.1

Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Zhao Hongjiang

Date: Tue, 09 Oct 2012 13:44:36 +0800
From: Zhao Hongjiang <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>, [email protected], containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Subject: [PATCH] ext2: fix return values on parse_options() failure

Quoted 5 lines

From: Zhao Hongjiang <[email protected]>

parse_options() in ext2 should return 0 when parse the mount options fails.

Thanks!
-Lukas

Quoted 32 lines
---
 fs/ext2/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext2/super.c +2 -4
index 6c205d0..fa04d02 100644
@@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb)
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb)
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
 			sbi->s_resgid = gid;
 			break;
-- 1.7.1
--

To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): alpine.LFD.2.00.1210090819590.11244-462rkM2+8ahgDJpvDrVWWBcY2uh10dtjAL8bYrjMMd8@public.gmane.org

#3 lore raw
Quoted 10 lines · Lukáš Czerner
Quoted 8 lines · Zhao Hongjiang

Date: Tue, 09 Oct 2012 13:44:36 +0800
From: Zhao Hongjiang <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
Eric W. Biederman <[email protected]>, [email protected], [email protected]
Subject: [PATCH] ext2: fix return values on parse_options() failure

Quoted 7 lines
Quoted 5 lines

From: Zhao Hongjiang <[email protected]>

parse_options() in ext2 should return 0 when parse the mount options fails.

Thanks, added to my tree.

Honza

Quoted 24 lines
Quoted 24 lines
---
 fs/ext2/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext2/super.c +2 -2
index 6c205d0..fa04d02 100644
@@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb)
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb)
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
Quoted 8 lines
Quoted 8 lines
fs/ext2/super.c +0 -2
 			sbi->s_resgid = gid;
 			break;
-- 1.7.1
--

To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

_______________________________________________
Containers mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/containers

#4 lore raw
In reply to Lukáš Czerner
Quoted 10 lines · Lukáš Czerner
Quoted 8 lines · Zhao Hongjiang

Date: Tue, 09 Oct 2012 13:44:36 +0800
From: Zhao Hongjiang <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
Eric W. Biederman <[email protected]>, [email protected], [email protected]
Subject: [PATCH] ext2: fix return values on parse_options() failure

Quoted 7 lines
Quoted 5 lines

From: Zhao Hongjiang <[email protected]>

parse_options() in ext2 should return 0 when parse the mount options fails.

Thanks, added to my tree.

Honza

Quoted 24 lines
Quoted 24 lines
---
 fs/ext2/super.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext2/super.c +2 -2
index 6c205d0..fa04d02 100644
@@ -469,7 +469,7 @@ static int parse_options(char *options, struct super_block *sb)
 			uid = make_kuid(current_user_ns(), option);
 			if (!uid_valid(uid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid uid value %d", option);
-				return -1;
+				return 0;
 
 			}
 			sbi->s_resuid = uid;
@@ -480,7 +480,7 @@ static int parse_options(char *options, struct super_block *sb)
 			gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(gid)) {
 				ext2_msg(sb, KERN_ERR, "Invalid gid value %d", option);
-				return -1;
+				return 0;
 			}
Quoted 8 lines
Quoted 8 lines
fs/ext2/super.c +0 -2
 			sbi->s_resgid = gid;
 			break;
-- 1.7.1
--

To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html