sunrpc: Convert kuids and kgids to uids and gids for printing
authorEric W. Biederman <ebiederm@xmission.com>
Sat, 2 Feb 2013 01:10:52 +0000 (17:10 -0800)
committerEric W. Biederman <ebiederm@xmission.com>
Wed, 13 Feb 2013 14:15:19 +0000 (06:15 -0800)
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>
net/sunrpc/auth_generic.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/auth_unix.c

index bff3e4730f6b8f498f99523c8246eb3acf535740..b6badafc6494767c68ae6bf2a5a35ae287707ccf 100644 (file)
@@ -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;
 }
 
index 1b8b3e4fad46b6a79226bde50a5460febb72b730..afbbcfb1078b35a6b33ec010aba7a42e5ef70438 100644 (file)
@@ -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;
index 9f3885745fb3ebd62d77844c7493192d3f570024..55b6ca6fbbd3c1cffb580a32dce0380a42b43776 100644 (file)
@@ -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);