jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

windows-smb-dead-vc-gc-20080801

Browse Source 
LICENSE MIT

deltas windows-smb-dead-vc-gc-20080627 and
windows-dead-vc-cleanup-take-two-20080703 attempted to
protect against an infinite recursion when cleaning up
dead smb virtual circuits.  they failed to address the
incrementing of the vc refcount in smb_ReleaseVCInternal
when it is about to call smb_CleanupDeadVC.  If the vc
is already being cleaned, then smb_ReleaseVCInternal
should not increment the refCount and should not call
smb_CleanupDeadVC.
This commit is contained in:
Jeffrey Altman 2008-08-01 14:09:50 +00:00
parent 0c20d8adb0
commit 890cbf6cae
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/WINNT/afsd/smb.c
View File

@ -1023,30 +1023,32 @@ void smb_ReleaseVCInternal(smb_vc_t *vcp)
break; break;
} }
osi_Log3(smb_logp,"VCP not dead and %sin smb_allVCsp vcp %x ref %d", osi_Log3(smb_logp,"VCP not dead and %sin smb_allVCsp vcp %x ref %d",
avcp?"not ":"",vcp, vcp->refCount); avcp?"":"not ",vcp, vcp->refCount);
#ifdef DEBUG
GenerateMiniDump(NULL);
#endif
/* This is a wrong. However, I suspect that there is an undercount /* This is a wrong. However, I suspect that there is an undercount
* and I don't want to release 1.4.1 in a state that will allow * and I don't want to release 1.4.1 in a state that will allow
* smb_vc_t objects to be deallocated while still in the * smb_vc_t objects to be deallocated while still in the
* smb_allVCsp list. The list is supposed to keep a reference * smb_allVCsp list. The list is supposed to keep a reference
* to the smb_vc_t. Put it back. * to the smb_vc_t. Put it back.
*/ */
vcp->refCount++; if (avcp)
vcp->refCount++;
} }
} else if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) { } else if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) {
/* The reference count is non-zero but the VC is dead. /* The reference count is non-zero but the VC is dead.
* This implies that some FIDs, TIDs, etc on the VC have yet to * This implies that some FIDs, TIDs, etc on the VC have yet to
* be cleaned up. Add a reference that will be dropped by * be cleaned up. If we were not called by smb_CleanupDeadVC(),
* add a reference that will be dropped by
* smb_CleanupDeadVC() and try to cleanup the VC again. * smb_CleanupDeadVC() and try to cleanup the VC again.
* Eventually the refCount will drop to zero when all of the * Eventually the refCount will drop to zero when all of the
* active threads working with the VC end their task. * active threads working with the VC end their task.
*/ */
vcp->refCount++; /* put the refCount back */ if (!(vcp->flags & SMB_VCFLAG_CLEAN_IN_PROGRESS)) {
lock_ReleaseWrite(&smb_rctLock); vcp->refCount++; /* put the refCount back */
smb_CleanupDeadVC(vcp); lock_ReleaseWrite(&smb_rctLock);
lock_ObtainWrite(&smb_rctLock); smb_CleanupDeadVC(vcp);
lock_ObtainWrite(&smb_rctLock);
}
} }
} }