From: Eric W. Biederman <ebiederm@xmission.com>
Date: Fri, 1 Feb 2013 11:03:16 +0000 (-0800)
Subject: nfs: Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID to keyring alloc
X-Git-Tag: v3.9-rc1~85^2~31
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4e963d4f3ed1b756ff20f84960fcb4db42509146;p=linux.git

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>
---

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index bc3968fa81e5..f77017c4e28b 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);