jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-22 17:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: when assigning a new clientModTime, hold a lock

Browse Source 
The smb server modifies the cm_scache_t clientModTime without
holding a write lock creating a race condition.  Fix it.

LICENSE MIT

Change-Id: I6f110f87ef76131965da31a8bf02685480ad9641
Reviewed-on: http://gerrit.openafs.org/857
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Jeffrey Altman 2009-11-19 18:19:39 -05:00 committed by Jeffrey Altman
parent 985a62bcf1
commit dac8173890
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6804,10 +6804,12 @@ long smb_CloseFID(smb_vc_t *vcp, smb_fid_t *fidp, cm_user_t *userp,
(fidp->flags & (SMB_FID_OPENWRITE | SMB_FID_DELONCLOSE)) (fidp->flags & (SMB_FID_OPENWRITE | SMB_FID_DELONCLOSE))
== SMB_FID_OPENWRITE) { == SMB_FID_OPENWRITE) {
if (dosTime != 0 && dosTime != -1) { if (dosTime != 0 && dosTime != -1) {
lock_ObtainWrite(&fidp->scp->rw);
scp->mask |= CM_SCACHEMASK_CLIENTMODTIME; scp->mask |= CM_SCACHEMASK_CLIENTMODTIME;
/* This fixes defect 10958 */ /* This fixes defect 10958 */
CompensateForSmbClientLastWriteTimeBugs(&dosTime); CompensateForSmbClientLastWriteTimeBugs(&dosTime);
smb_UnixTimeFromDosUTime(&scp->clientModTime, dosTime); smb_UnixTimeFromDosUTime(&scp->clientModTime, dosTime);
lock_ReleaseWrite(&fidp->scp->rw);
} }
if (smb_AsyncStore != 2) { if (smb_AsyncStore != 2) {
lock_ReleaseMutex(&fidp->mx); lock_ReleaseMutex(&fidp->mx);
@ -7536,8 +7538,10 @@ long smb_ReceiveCoreWrite(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
*/ */
lock_ObtainMutex(&fidp->mx); lock_ObtainMutex(&fidp->mx);
if ((fidp->flags & SMB_FID_MTIMESETDONE) != SMB_FID_MTIMESETDONE) { if ((fidp->flags & SMB_FID_MTIMESETDONE) != SMB_FID_MTIMESETDONE) {
lock_ObtainWrite(&fidp->scp->rw);
fidp->scp->mask |= CM_SCACHEMASK_CLIENTMODTIME; fidp->scp->mask |= CM_SCACHEMASK_CLIENTMODTIME;
fidp->scp->clientModTime = time(NULL); fidp->scp->clientModTime = time(NULL);
lock_ReleaseWrite(&fidp->scp->rw);
} }
lock_ReleaseMutex(&fidp->mx); lock_ReleaseMutex(&fidp->mx);
@ -7764,8 +7768,10 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out
*/ */
lock_ObtainMutex(&fidp->mx); lock_ObtainMutex(&fidp->mx);
if ((fidp->flags & SMB_FID_LOOKSLIKECOPY) != SMB_FID_LOOKSLIKECOPY) { if ((fidp->flags & SMB_FID_LOOKSLIKECOPY) != SMB_FID_LOOKSLIKECOPY) {
lock_ObtainWrite(&fidp->scp->rw);
fidp->scp->mask |= CM_SCACHEMASK_CLIENTMODTIME; fidp->scp->mask |= CM_SCACHEMASK_CLIENTMODTIME;
fidp->scp->clientModTime = time(NULL); fidp->scp->clientModTime = time(NULL);
lock_ReleaseWrite(&fidp->scp->rw);
} }
lock_ReleaseMutex(&fidp->mx); lock_ReleaseMutex(&fidp->mx);

2
src/WINNT/afsd/smb3.c
View File

@ -6890,8 +6890,10 @@ long smb_ReceiveV3WriteX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
*/ */
lock_ObtainMutex(&fidp->mx); lock_ObtainMutex(&fidp->mx);
if ((fidp->flags & SMB_FID_MTIMESETDONE) != SMB_FID_MTIMESETDONE) { if ((fidp->flags & SMB_FID_MTIMESETDONE) != SMB_FID_MTIMESETDONE) {
lock_ObtainWrite(&fidp->scp->rw);
scp->mask |= CM_SCACHEMASK_CLIENTMODTIME; scp->mask |= CM_SCACHEMASK_CLIENTMODTIME;
scp->clientModTime = time(NULL); scp->clientModTime = time(NULL);
lock_ReleaseWrite(&fidp->scp->rw);
} }
lock_ReleaseMutex(&fidp->mx); lock_ReleaseMutex(&fidp->mx);