From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 5 Apr 2012 21:00:28 +0000 (-0400)
Subject: Windows: cm_AddACLCache lock ordering
X-Git-Tag: upstream/1.8.0_pre1^2~2640
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7881de8cc17924120e45e498add1adc63fd85e5c;p=packages%2Fo%2Fopenafs.git

Windows: cm_AddACLCache lock ordering

cm_aclLock must be obtained after cm_user_t mx and cm_cellLock.

cm_user_t mx must be obtained before cm_cellLock.

Change-Id: Iaf9fcf17c7ea50f2f5a83aefa759b7077ef28be6
Reviewed-on: http://gerrit.openafs.org/7051
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/WINNT/afsd/cm_aclent.c b/src/WINNT/afsd/cm_aclent.c
index c6433e783..b9f06fc18 100644
--- a/src/WINNT/afsd/cm_aclent.c
+++ b/src/WINNT/afsd/cm_aclent.c
@@ -145,8 +145,8 @@ time_t cm_TGTLifeTime(cm_user_t *userp, afs_uint32 cellID)
     cm_ucell_t * ucp = NULL;
     time_t      expirationTime = 0;
 
-    cellp = cm_FindCellByID(cellID, CM_FLAG_NOPROBE);
     lock_ObtainMutex(&userp->mx);
+    cellp = cm_FindCellByID(cellID, CM_FLAG_NOPROBE);
     ucp = cm_GetUCell(userp, cellp);
     if (ucp->ticketp)
         expirationTime = ucp->expirationTime;
@@ -165,13 +165,16 @@ time_t cm_TGTLifeTime(cm_user_t *userp, afs_uint32 cellID)
 long cm_AddACLCache(cm_scache_t *scp, cm_user_t *userp, afs_uint32 rights)
 {
     struct cm_aclent *aclp;
+    time_t tgtLifeTime;
+
+    tgtLifeTime = cm_TGTLifeTime(userp, scp->fid.cell);
 
     lock_ObtainWrite(&cm_aclLock);
     for (aclp = scp->randomACLp; aclp; aclp = aclp->nextp) {
         if (aclp->userp == userp) {
             aclp->randomAccess = rights;
-            if (aclp->tgtLifetime == 0)
-                aclp->tgtLifetime = cm_TGTLifeTime(userp, scp->fid.cell);
+            if (aclp->tgtLifetime < tgtLifeTime)
+                aclp->tgtLifetime = tgtLifeTime;
             if (cm_data.aclLRUp != aclp) {
                 /* move to the head of the LRU queue */
                 osi_QRemoveHT((osi_queue_t **) &cm_data.aclLRUp, (osi_queue_t **) &cm_data.aclLRUEndp, &aclp->q);
@@ -197,7 +200,7 @@ long cm_AddACLCache(cm_scache_t *scp, cm_user_t *userp, afs_uint32 rights)
     cm_HoldUser(userp);
     aclp->userp = userp;
     aclp->randomAccess = rights;
-    aclp->tgtLifetime = cm_TGTLifeTime(userp, scp->fid.cell);
+    aclp->tgtLifetime = tgtLifeTime;
     lock_ReleaseWrite(&cm_aclLock);
 
     return 0;