From ad63745f357e377c613881fa3470b85d4d36fe36 Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Sat, 29 Jan 2011 12:48:02 -0500 Subject: [PATCH] ubik: cleanup DB lock usage in SDISK_SendFile Some failure paths can return from SDISK_SendFile with the database lock still held. Other failure paths will cause setlabel to be called without holding the lock. Rework the failure paths so we always release the DB lock before returning, and always hold it when calling setlabel. Change-Id: I4cf98ecc9874110273e2cb4f94c37bdb9b43f0a2 Reviewed-on: http://gerrit.openafs.org/4151 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/ubik/remote.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ubik/remote.c b/src/ubik/remote.c index 66c1ae7322..ba41a5ec7a 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -474,7 +474,10 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, /* send the file back to the requester */ + dbase = ubik_dbase; + if ((code = ubik_CheckAuth(rxcall))) { + DBHOLD(dbase); goto failed; } @@ -495,10 +498,10 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, if (offset && offset != otherHost) { /* we *know* this is the wrong guy */ code = USYNC; + DBHOLD(dbase); goto failed; } - dbase = ubik_dbase; DBHOLD(dbase); /* abort any active trans that may scribble over the database */ @@ -531,7 +534,6 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, #endif code = rx_Read(rxcall, tbuffer, tlen); if (code != tlen) { - DBRELE(dbase); ubik_dprint("Rx-read length error=%d\n", code); code = BULK_ERROR; close(fd); @@ -540,7 +542,6 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, code = write(fd, tbuffer, tlen); pass++; if (code != tlen) { - DBRELE(dbase); ubik_dprint("write failed error=%d\n", code); code = UIOERROR; close(fd); @@ -580,8 +581,8 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, #else LWP_NoYieldSignal(&dbase->version); #endif - DBRELE(dbase); - failed: + +failed: if (code) { unlink(pbuffer); /* Failed to sync. Allow reads again for now. */ @@ -595,6 +596,7 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file, } else { ubik_print("Ubik: Synchronize database completed\n"); } + DBRELE(dbase); return code; }