From: Benjamin Kaduk <kaduk@mit.edu>
Date: Sun, 22 Nov 2015 19:24:43 +0000 (-0600)
Subject: volser: set error, not code, before rfail
X-Git-Tag: upstream/1.8.0_pre1^2~192
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=888fc16db5f0063464bf219a6cf6fee0faea4705;p=packages%2Fo%2Fopenafs.git

volser: set error, not code, before rfail

The rfail cleanup handler overwrites 'code' ~unconditionally, but
does use an existing 'error' value if present.  Since the intent
is to return failure to the caller, preserve the code in the error
variable and do so.

FIXES 131897

Change-Id: I25db2f9ad75a5b856626d39d35f97a09f26bd7a9
Reviewed-on: http://gerrit.openafs.org/12108
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index cdf7dc829..c2dfa217e 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -4067,7 +4067,7 @@ UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
 
 	code = CheckTrans(fromconn, &fromtid, afrompart, &orig_status);
 	if (code) {
-	    code = ENOENT;
+	    error = ENOENT;
 	    goto rfail;
 	}