summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2013-02-01 03:03:16 -0800
committerEric W. Biederman <ebiederm@xmission.com>2013-02-13 06:15:27 -0800
commit4e963d4f3ed1b756ff20f84960fcb4db42509146 (patch)
treec3b53cedf29fee5844fd9236706c8185dac96287
parentf025adf191924e3a75ce80e130afcd2485b53bb8 (diff)
downloadlinux-3.10-4e963d4f3ed1b756ff20f84960fcb4db42509146.tar.gz
linux-3.10-4e963d4f3ed1b756ff20f84960fcb4db42509146.tar.bz2
linux-3.10-4e963d4f3ed1b756ff20f84960fcb4db42509146.zip
nfs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring alloc
Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--fs/nfs/idmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index bc3968fa81e..f77017c4e28 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -193,7 +193,8 @@ static int nfs_idmap_init_keyring(void)
if (!cred)
return -ENOMEM;
- keyring = keyring_alloc(".id_resolver", 0, 0, cred,
+ keyring = keyring_alloc(".id_resolver",
+ GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
(KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ,
KEY_ALLOC_NOT_IN_QUOTA, NULL);