Commit f94f72ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

NFS client bugfixes for Linux 3.3 (pull 3)

* tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Fix machine creds in generic_create_cred and generic_match
parents a51f67a4 875ad3f8

net/sunrpc/auth_generic.c

+16 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) 
	if (gcred->acred.group_info != NULL)

		get_group_info(gcred->acred.group_info);

	gcred->acred.machine_cred = acred->machine_cred;

	gcred->acred.principal = acred->principal;



	dprintk("RPC:       allocated %s cred %p for uid %d gid %d\n",

			gcred->acred.machine_cred ? "machine" : "generic",
@@ -123,6 +124,17 @@ generic_destroy_cred(struct rpc_cred *cred) 
	call_rcu(&cred->cr_rcu, generic_free_cred_callback);

}



static int

machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flags)

{

	if (!gcred->acred.machine_cred ||

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

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

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

		return 0;

	return 1;

}



/*

 * Match credentials against current process creds.

 */
@@ -132,9 +144,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags) 
	struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base);

	int i;



	if (acred->machine_cred)

		return machine_cred_match(acred, gcred, flags);



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

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

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

	    gcred->acred.machine_cred != 0)

		goto out_nomatch;



	/* Optimisation in the case where pointers are identical... */