Skip to content

Commit

Permalink
sunrpc: Update svcgss xdr handle to rpsec_contect cache
Browse files Browse the repository at this point in the history
For each received uid call make_kuid and validate the result.
For each received gid call make_kgid and validate the result.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
  • Loading branch information
Eric W. Biederman committed Feb 13, 2013
1 parent 90602c7 commit 683428f
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions net/sunrpc/auth_gss/svcauth_gss.c
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ static int rsc_parse(struct cache_detail *cd,
{
/* contexthandle expiry [ uid gid N <n gids> mechname ...mechdata... ] */
char *buf = mesg;
int id;
int len, rv;
struct rsc rsci, *rscp = NULL;
time_t expiry;
Expand All @@ -444,16 +445,24 @@ static int rsc_parse(struct cache_detail *cd,
goto out;

/* uid, or NEGATIVE */
rv = get_int(&mesg, &rsci.cred.cr_uid);
rv = get_int(&mesg, &id);
if (rv == -EINVAL)
goto out;
if (rv == -ENOENT)
set_bit(CACHE_NEGATIVE, &rsci.h.flags);
else {
int N, i;

/* uid */
rsci.cred.cr_uid = make_kuid(&init_user_ns, id);
if (!uid_valid(rsci.cred.cr_uid))
goto out;

/* gid */
if (get_int(&mesg, &rsci.cred.cr_gid))
if (get_int(&mesg, &id))
goto out;
rsci.cred.cr_gid = make_kgid(&init_user_ns, id);
if (!gid_valid(rsci.cred.cr_gid))
goto out;

/* number of additional gid's */
Expand All @@ -467,11 +476,10 @@ static int rsc_parse(struct cache_detail *cd,
/* gid's */
status = -EINVAL;
for (i=0; i<N; i++) {
gid_t gid;
kgid_t kgid;
if (get_int(&mesg, &gid))
if (get_int(&mesg, &id))
goto out;
kgid = make_kgid(&init_user_ns, gid);
kgid = make_kgid(&init_user_ns, id);
if (!gid_valid(kgid))
goto out;
GROUP_AT(rsci.cred.cr_group_info, i) = kgid;
Expand Down

0 comments on commit 683428f

Please sign in to comment.