From: Dwight Engen <dwight.engen@oracle.com>
To: Ben Myers <bpm@sgi.com>
Cc: cbe-oss-dev@lists.ozlabs.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Arnd Bergmann <arnd@arndb.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linux-kernel@vger.kernel.org, xfs@oss.sgi.com,
linux-next@vger.kernel.org, Jeremy Kerr <jk@ozlabs.org>,
linuxppc-dev@lists.ozlabs.org, Gao feng <gaofeng@cn.fujitsu.com>
Subject: [PATCH] powerpc/spufs: convert userns uid/gid mount options to kuid/kgid
Date: Wed, 21 Aug 2013 14:33:51 -0400 [thread overview]
Message-ID: <20130821143351.5840d556@oracle.com> (raw)
In-Reply-To: <20130821155654.GI5262@sgi.com>
Acked-by: Jeremy Kerr <jk@ozlabs.org>
Tested-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
---
arch/powerpc/platforms/cell/spufs/inode.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index f390042..87ba7cf 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -620,12 +620,16 @@ spufs_parse_options(struct super_block *sb, char *options, struct inode *root)
case Opt_uid:
if (match_int(&args[0], &option))
return 0;
- root->i_uid = option;
+ root->i_uid = make_kuid(current_user_ns(), option);
+ if (!uid_valid(root->i_uid))
+ return 0;
break;
case Opt_gid:
if (match_int(&args[0], &option))
return 0;
- root->i_gid = option;
+ root->i_gid = make_kgid(current_user_ns(), option);
+ if (!gid_valid(root->i_gid))
+ return 0;
break;
case Opt_mode:
if (match_octal(&args[0], &option))
--
1.8.1.4
On Wed, 21 Aug 2013 10:56:54 -0500
Ben Myers <bpm@sgi.com> wrote:
> Hey Dwight,
>
> On Wed, Aug 21, 2013 at 02:30:04PM +0800, Jeremy Kerr wrote:
> > > Yes, I agree. The other filesystems that take an Opt_uid as well
> > > do use current_user_ns() and not init_user_ns. They also do a
> > > uid_valid() check and fail the mount (or fallback to
> > > GLOBAL_ROOT_UID). So I think that would look like this:
> >
> > Looks good to me. Builds and mounts as expected.
> >
> > Acked-by: Jeremy Kerr <jk@ozlabs.org>
>
> Could you repost this patch with the right subject and a commit
> header? Given Jeremy's Ack I think we could proceed to pull this in.
Sure, I just wanted to make sure someone had tested it first, which it
looks like Jeremy did, thanks.
> Regards,
> Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-08-21 18:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 7:20 linux-next: build failure after merge of the final tree Stephen Rothwell
2013-08-20 16:07 ` Dwight Engen
2013-08-20 19:28 ` Ben Myers
2013-08-21 0:22 ` Stephen Rothwell
2013-08-21 15:54 ` Ben Myers
2013-08-20 20:46 ` Arnd Bergmann
2013-08-21 5:08 ` Dwight Engen
2013-08-21 6:30 ` Jeremy Kerr
2013-08-21 15:56 ` Ben Myers
2013-08-21 18:33 ` Dwight Engen [this message]
2013-08-21 20:05 ` [PATCH] powerpc/spufs: convert userns uid/gid mount options to kuid/kgid Arnd Bergmann
2013-08-21 20:24 ` Ben Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130821143351.5840d556@oracle.com \
--to=dwight.engen@oracle.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bpm@sgi.com \
--cc=cbe-oss-dev@lists.ozlabs.org \
--cc=gaofeng@cn.fujitsu.com \
--cc=jk@ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sfr@canb.auug.org.au \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).