Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b4d51b0 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

sunrpc: Use uid_eq and gid_eq where appropriate 



When comparing uids use uid_eq instead of ==.
When comparing gids use gid_eq instead of ==.

And unfortunate cost of type safety.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 7eaf040b

net/sunrpc/auth_generic.c

+4 −4
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flag 
{

	if (!gcred->acred.machine_cred ||

	    gcred->acred.principal != acred->principal ||

	    gcred->acred.uid != acred->uid ||

	    gcred->acred.gid != acred->gid)

	    !uid_eq(gcred->acred.uid, acred->uid) ||

	    !gid_eq(gcred->acred.gid, acred->gid))

		return 0;

	return 1;

}
@@ -147,8 +147,8 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags) 
	if (acred->machine_cred)

		return machine_cred_match(acred, gcred, flags);



	if (gcred->acred.uid != acred->uid ||

	    gcred->acred.gid != acred->gid ||

	if (!uid_eq(gcred->acred.uid, acred->uid) ||

	    !gid_eq(gcred->acred.gid, acred->gid) ||

	    gcred->acred.machine_cred != 0)

		goto out_nomatch;

net/sunrpc/auth_gss/auth_gss.c

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ __gss_find_upcall(struct rpc_pipe *pipe, kuid_t uid) 
{

	struct gss_upcall_msg *pos;

	list_for_each_entry(pos, &pipe->in_downcall, list) {

		if (pos->uid != uid)

		if (!uid_eq(pos->uid, uid))

			continue;

		atomic_inc(&pos->count);

		dprintk("RPC:       %s found msg %p\n", __func__, pos);
@@ -1115,7 +1115,7 @@ gss_match(struct auth_cred *acred, struct rpc_cred *rc, int flags) 
	}

	if (gss_cred->gc_principal != NULL)

		return 0;

	return rc->cr_uid == acred->uid;

	return uid_eq(rc->cr_uid, acred->uid);

}



/*

net/sunrpc/auth_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags) 
	unsigned int i;





	if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid)

	if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid))

		return 0;



	if (acred->group_info != NULL)

net/sunrpc/svcauth_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int unix_gid_match(struct cache_head *corig, struct cache_head *cnew) 
{

	struct unix_gid *orig = container_of(corig, struct unix_gid, h);

	struct unix_gid *new = container_of(cnew, struct unix_gid, h);

	return orig->uid == new->uid;

	return uid_eq(orig->uid, new->uid);

}

static void unix_gid_init(struct cache_head *cnew, struct cache_head *citem)

{