Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: "Eric W. Biederman" <ebiederm@xmission.com>

+13 -7
+3 -1
net/sunrpc/auth_generic.c
··· 96 96 97 97 dprintk("RPC: allocated %s cred %p for uid %d gid %d\n", 98 98 gcred->acred.machine_cred ? "machine" : "generic", 99 - gcred, acred->uid, acred->gid); 99 + gcred, 100 + from_kuid(&init_user_ns, acred->uid), 101 + from_kgid(&init_user_ns, acred->gid)); 100 102 return &gcred->gc_base; 101 103 } 102 104
+8 -5
net/sunrpc/auth_gss/auth_gss.c
··· 517 517 int err = 0; 518 518 519 519 dprintk("RPC: %5u %s for uid %u\n", 520 - task->tk_pid, __func__, cred->cr_uid); 520 + task->tk_pid, __func__, from_kuid(&init_user_ns, cred->cr_uid)); 521 521 gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred); 522 522 if (PTR_ERR(gss_msg) == -EAGAIN) { 523 523 /* XXX: warning on the first, under the assumption we ··· 549 549 gss_release_msg(gss_msg); 550 550 out: 551 551 dprintk("RPC: %5u %s for uid %u result %d\n", 552 - task->tk_pid, __func__, cred->cr_uid, err); 552 + task->tk_pid, __func__, 553 + from_kuid(&init_user_ns, cred->cr_uid), err); 553 554 return err; 554 555 } 555 556 ··· 563 562 DEFINE_WAIT(wait); 564 563 int err = 0; 565 564 566 - dprintk("RPC: %s for uid %u\n", __func__, cred->cr_uid); 565 + dprintk("RPC: %s for uid %u\n", 566 + __func__, from_kuid(&init_user_ns, cred->cr_uid)); 567 567 retry: 568 568 gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred); 569 569 if (PTR_ERR(gss_msg) == -EAGAIN) { ··· 606 604 gss_release_msg(gss_msg); 607 605 out: 608 606 dprintk("RPC: %s for uid %u result %d\n", 609 - __func__, cred->cr_uid, err); 607 + __func__, from_kuid(&init_user_ns, cred->cr_uid), err); 610 608 return err; 611 609 } 612 610 ··· 1061 1059 int err = -ENOMEM; 1062 1060 1063 1061 dprintk("RPC: %s for uid %d, flavor %d\n", 1064 - __func__, acred->uid, auth->au_flavor); 1062 + __func__, from_kuid(&init_user_ns, acred->uid), 1063 + auth->au_flavor); 1065 1064 1066 1065 if (!(cred = kzalloc(sizeof(*cred), GFP_NOFS))) 1067 1066 goto out_err;
+2 -1
net/sunrpc/auth_unix.c
··· 65 65 unsigned int i; 66 66 67 67 dprintk("RPC: allocating UNIX cred for uid %d gid %d\n", 68 - acred->uid, acred->gid); 68 + from_kuid(&init_user_ns, acred->uid), 69 + from_kgid(&init_user_ns, acred->gid)); 69 70 70 71 if (!(cred = kmalloc(sizeof(*cred), GFP_NOFS))) 71 72 return ERR_PTR(-ENOMEM);