Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next

[karo-tx-linux.git] / net / sunrpc / auth_unix.c

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index e50502d8ceb777a6c6795e22673753c4eea6e538..52c5abdee211cde762075809a09ca2d849ddeca3 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/auth.h>
+#include <linux/user_namespace.h>
 
 #define NFS_NGROUPS    16
 
@@ -78,8 +79,11 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
                groups = NFS_NGROUPS;
 
        cred->uc_gid = acred->gid;
-       for (i = 0; i < groups; i++)
-               cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
+       for (i = 0; i < groups; i++) {
+               gid_t gid;
+               gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+               cred->uc_gids[i] = gid;
+       }
        if (i < NFS_NGROUPS)
                cred->uc_gids[i] = NOGROUP;
 
@@ -126,9 +130,12 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
                groups = acred->group_info->ngroups;
        if (groups > NFS_NGROUPS)
                groups = NFS_NGROUPS;
-       for (i = 0; i < groups ; i++)
-               if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i))
+       for (i = 0; i < groups ; i++) {
+               gid_t gid;
+               gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+               if (cred->uc_gids[i] != gid)
                        return 0;
+       }
        if (groups < NFS_NGROUPS &&
            cred->uc_gids[groups] != NOGROUP)
                return 0;