* [PATCH] ext2: fix return values on parse_options() failure
@ 2012-10-09 5:44 Zhao Hongjiang
2012-10-09 6:29 ` Lukáš Czerner
0 siblings, 1 reply; 3+ messages in thread
From: Zhao Hongjiang @ 2012-10-09 5:44 UTC (permalink / raw)
To: jack
Cc: linux-ext4, linux-kernel, Eric W. Biederman, serge.hallyn, containers
From: Zhao Hongjiang <zhaohongjiang@huawei.com>
parse_options() in ext2 should return 0 when parse the mount options fails.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
---
fs/ext2/super.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 6c205d0..fa04d02 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ext2: fix return values on parse_options() failure
2012-10-09 5:44 [PATCH] ext2: fix return values on parse_options() failure Zhao Hongjiang
@ 2012-10-09 6:29 ` Lukáš Czerner
2012-10-09 21:22 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Lukáš Czerner @ 2012-10-09 6:29 UTC (permalink / raw)
To: Zhao Hongjiang
Cc: jack, linux-ext4, linux-kernel, Eric W. Biederman, serge.hallyn,
containers
On Tue, 9 Oct 2012, Zhao Hongjiang wrote:
> Date: Tue, 09 Oct 2012 13:44:36 +0800
> From: Zhao Hongjiang <zhaohongjiang37@gmail.com>
> To: jack@suse.cz
> Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
> Eric W. Biederman <ebiederm@xmission.com>, serge.hallyn@canonical.com,
> containers@lists.linux-foundation.org
> Subject: [PATCH] ext2: fix return values on parse_options() failure
>
> From: Zhao Hongjiang <zhaohongjiang@huawei.com>
>
> parse_options() in ext2 should return 0 when parse the mount options fails.
>
> Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Thanks!
-Lukas
> ---
> fs/ext2/super.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext2/super.c b/fs/ext2/super.c
> index 6c205d0..fa04d02 100644
> --- a/fs/ext2/super.c
> +++ b/fs/ext2/super.c
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ext2: fix return values on parse_options() failure
2012-10-09 6:29 ` Lukáš Czerner
@ 2012-10-09 21:22 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2012-10-09 21:22 UTC (permalink / raw)
To: Lukáš Czerner
Cc: Zhao Hongjiang, jack, linux-ext4, linux-kernel,
Eric W. Biederman, serge.hallyn, containers
On Tue 09-10-12 08:29:50, Lukáš Czerner wrote:
> On Tue, 9 Oct 2012, Zhao Hongjiang wrote:
>
> > Date: Tue, 09 Oct 2012 13:44:36 +0800
> > From: Zhao Hongjiang <zhaohongjiang37@gmail.com>
> > To: jack@suse.cz
> > Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
> > Eric W. Biederman <ebiederm@xmission.com>, serge.hallyn@canonical.com,
> > containers@lists.linux-foundation.org
> > Subject: [PATCH] ext2: fix return values on parse_options() failure
> >
> > From: Zhao Hongjiang <zhaohongjiang@huawei.com>
> >
> > parse_options() in ext2 should return 0 when parse the mount options fails.
> >
> > Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
>
> Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Thanks, added to my tree.
Honza
> > ---
> > fs/ext2/super.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/ext2/super.c b/fs/ext2/super.c
> > index 6c205d0..fa04d02 100644
> > --- a/fs/ext2/super.c
> > +++ b/fs/ext2/super.c
> > @@ -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 majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-09 21:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-09 5:44 [PATCH] ext2: fix return values on parse_options() failure Zhao Hongjiang
2012-10-09 6:29 ` Lukáš Czerner
2012-10-09 21:22 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®