DEVEL15-linux-nfs-pag-handling-20070822

don't mishandle pag argument when passed in from e.g. knfs

don't make keyring pag for nfs clients

(cherry picked from commit 314b3abaff30fb6a359944f14dca3716b8572547)

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index c0d82702792ceb47da3d2aa87de3a6138dffb5d1..ed7516c673fd7334b06436738ad135a9ef9bed7b 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -25,6 +25,7 @@ RCSID
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_stats.h"     /* statistics */
+#include "afs/nfsclient.h"
 #ifdef AFS_LINUX22_ENV
 #include "h/smp_lock.h"
 #endif
@@ -330,8 +331,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
     code = __setpag(cr, pagvalue, newpag, change_parent);
 
 #ifdef LINUX_KEYRING_SUPPORT
-    if (code == 0) {
-
+    if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
        (void) install_session_keyring(current, NULL);
 
        if (current->signal->session_keyring) {

diff --git a/src/afs/afs_nfsclnt.c b/src/afs/afs_nfsclnt.c
index 59aaa457c8620780d6dc9e72ee03266efcd7f1fa..c8941dd219d685cd67eb51c12f04200c92cb77a8 100644 (file)
--- a/src/afs/afs_nfsclnt.c
+++ b/src/afs/afs_nfsclnt.c
@@ -202,6 +202,12 @@ afs_nfsclient_reqhandler(struct afs_exporter *exporter,
     uid = crgetuid(*cred);
 #else
     uid = (*cred)->cr_uid;
+#endif
+    /* Do this early, so pag management knows */
+#ifdef AFS_OSF_ENV
+    (*cred)->cr_ruid = NFSXLATOR_CRED; /* Identify it as nfs xlator call */
+#else
+    (*cred)->cr_rgid = NFSXLATOR_CRED; /* Identify it as nfs xlator call */
 #endif
     if ((afs_nfsexporter->exp_states & EXP_CLIPAGS) && pag != NOPAG) {
        uid = pag;
@@ -300,11 +306,6 @@ afs_nfsclient_reqhandler(struct afs_exporter *exporter,
     *pagparam = pag;
     *outexporter = (struct afs_exporter *)np;
     afs_PutUser(au, WRITE_LOCK);
-#ifdef AFS_OSF_ENV
-    (*cred)->cr_ruid = NFSXLATOR_CRED; /* Identify it as nfs xlator call */
-#else
-    (*cred)->cr_rgid = NFSXLATOR_CRED; /* Identify it as nfs xlator call */
-#endif
 /*    ReleaseWriteLock(&afs_xnfsreq);  */
     return 0;
 }

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 9ebbdd1afbde3f25fdcf50daae9feb229a67ae2c..ac6062b15e53ca2e675c93cee1db60b2c09c180d 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -599,7 +599,7 @@ PagInCred(const struct AFS_UCRED *cred)
 #endif
 out:
 #if defined(AFS_LINUX26_ENV) && defined(LINUX_KEYRING_SUPPORT)
-    if (pag == NOPAG) {
+    if (pag == NOPAG && cred->cr_rgid != NFSXLATOR_CRED) {
        struct key *key;
        afs_uint32 upag, newpag;
 

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index b2e7d77467ac00f3cb316b8936917c071faa1aae..4ea21b6ef2ba247b04d373eec7083741124af544 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -3339,6 +3339,7 @@ HandleClientContext(struct afs_ioctl *ablob, int *com,
     struct AFS_UCRED *newcred;
     struct unixuser *au;
     afs_uint32 comp = *com & 0xff00;
+    afs_uint32 h, l;
 
 #if defined(AFS_SGIMP_ENV)
     osi_Assert(ISAFS_GLOCK());
@@ -3380,7 +3381,7 @@ HandleClientContext(struct afs_ioctl *ablob, int *com,
        u.u_error = 0;
 #endif
        /* check for acceptable opcodes for normal folks, which are, so far,
-        * set tokens and unlog.
+        * get/set tokens, sysname, and unlog.
         */
        if (i != 9 && i != 3 && i != 38 && i != 8) {
            osi_FreeLargeSpace(inData);
@@ -3409,9 +3410,17 @@ HandleClientContext(struct afs_ioctl *ablob, int *com,
     newcred->cr_groupset.gs_union.un_groups[0] = g0;
     newcred->cr_groupset.gs_union.un_groups[1] = g1;
 #elif defined(AFS_LINUX26_ENV)
+#ifdef AFS_LINUX26_ONEGROUP_ENV
+    newcred->cr_group_info = groups_alloc(1); /* not that anything sets this */
+    l = (((g0-0x3f00) & 0x3fff) << 14) | ((g1-0x3f00) & 0x3fff);
+    h = ((g0-0x3f00) >> 14);
+    h = ((g1-0x3f00) >> 14) + h + h + h;
+    GROUP_AT(newcred->cr_group_info, 0) = ((h << 28) | l);
+#else
     newcred->cr_group_info = groups_alloc(2);
     GROUP_AT(newcred->cr_group_info, 0) = g0;
     GROUP_AT(newcred->cr_group_info, 1) = g1;
+#endif
 #else
     newcred->cr_groups[0] = g0;
     newcred->cr_groups[1] = g1;
@@ -3467,7 +3476,7 @@ HandleClientContext(struct afs_ioctl *ablob, int *com,
        EXP_RELE(outexporter);
     }
     if (!code) 
-      *com = (*com) | comp;
+       *com = (*com) | comp;
     return code;
 }
 #endif /* AFS_NEED_CLIENTCONTEXT */