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

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

sunrpc: Convert kuids and kgids to uids and gids for printing 



When printing kuids and kgids for debugging purpropses convert them
to ordinary integers so their values can be fed to the oridnary
print functions.

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 9132adb0

net/sunrpc/auth_generic.c

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) 


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

			gcred->acred.machine_cred ? "machine" : "generic",

			gcred, acred->uid, acred->gid);

			gcred,

			from_kuid(&init_user_ns, acred->uid),

			from_kgid(&init_user_ns, acred->gid));

	return &gcred->gc_base;

}

net/sunrpc/auth_gss/auth_gss.c

+8 −5
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ gss_refresh_upcall(struct rpc_task *task) 
	int err = 0;



	dprintk("RPC: %5u %s for uid %u\n",

		task->tk_pid, __func__, cred->cr_uid);

		task->tk_pid, __func__, from_kuid(&init_user_ns, cred->cr_uid));

	gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred);

	if (PTR_ERR(gss_msg) == -EAGAIN) {

		/* XXX: warning on the first, under the assumption we
@@ -549,7 +549,8 @@ gss_refresh_upcall(struct rpc_task *task) 
	gss_release_msg(gss_msg);

out:

	dprintk("RPC: %5u %s for uid %u result %d\n",

		task->tk_pid, __func__, cred->cr_uid, err);

		task->tk_pid, __func__,

		from_kuid(&init_user_ns, cred->cr_uid),	err);

	return err;

}
@@ -562,7 +563,8 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) 
	DEFINE_WAIT(wait);

	int err = 0;



	dprintk("RPC:       %s for uid %u\n", __func__, cred->cr_uid);

	dprintk("RPC:       %s for uid %u\n",

		__func__, from_kuid(&init_user_ns, cred->cr_uid));

retry:

	gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred);

	if (PTR_ERR(gss_msg) == -EAGAIN) {
@@ -604,7 +606,7 @@ out_intr: 
	gss_release_msg(gss_msg);

out:

	dprintk("RPC:       %s for uid %u result %d\n",

		__func__, cred->cr_uid, err);

		__func__, from_kuid(&init_user_ns, cred->cr_uid), err);

	return err;

}
@@ -1059,7 +1061,8 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) 
	int err = -ENOMEM;



	dprintk("RPC:       %s for uid %d, flavor %d\n",

		__func__, acred->uid, auth->au_flavor);

		__func__, from_kuid(&init_user_ns, acred->uid),

		auth->au_flavor);



	if (!(cred = kzalloc(sizeof(*cred), GFP_NOFS)))

		goto out_err;

net/sunrpc/auth_unix.c

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) 
	unsigned int i;



	dprintk("RPC:       allocating UNIX cred for uid %d gid %d\n",

			acred->uid, acred->gid);

			from_kuid(&init_user_ns, acred->uid),

			from_kgid(&init_user_ns, acred->gid));



	if (!(cred = kmalloc(sizeof(*cred), GFP_NOFS)))

		return ERR_PTR(-ENOMEM);