aboutsummaryrefslogtreecommitdiff
path: root/net/sunrpc
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2013-02-01 17:18:04 -0800
committerEric W. Biederman <ebiederm@xmission.com>2013-02-13 06:15:20 -0800
commite572fc739822ad779493b8a72bd27f2101fc3373 (patch)
tree0178825a3990b0b316e7ecd2830cdcfbc3451a5e /net/sunrpc
parentcdba321e291f0fbf5abda4d88340292b858e3d4d (diff)
downloadlinux-e572fc739822ad779493b8a72bd27f2101fc3373.tar.gz
sunrpc: Use gid_valid to test for gid != INVALID_GID
In auth unix there are a couple of places INVALID_GID is used a sentinel to mark the end of uc_gids array. Use gid_valid as a type safe way to verify we have not hit the end of valid data in the array. Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/auth_unix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 55b6ca6fbbd..c434fde2079 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -131,8 +131,7 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
for (i = 0; i < groups ; i++)
if (!gid_eq(cred->uc_gids[i], GROUP_AT(acred->group_info, i)))
return 0;
- if (groups < NFS_NGROUPS &&
- cred->uc_gids[groups] != INVALID_GID)
+ if (groups < NFS_NGROUPS && gid_valid(cred->uc_gids[groups]))
return 0;
return 1;
}
@@ -161,7 +160,7 @@ unx_marshal(struct rpc_task *task, __be32 *p)
*p++ = htonl((u32) cred->uc_uid);
*p++ = htonl((u32) cred->uc_gid);
hold = p++;
- for (i = 0; i < 16 && cred->uc_gids[i] != INVALID_GID; i++)
+ for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++)
*p++ = htonl((u32) cred->uc_gids[i]);
*hold = htonl(p - hold - 1); /* gid array length */
*base = htonl((p - base - 1) << 2); /* cred length */