From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 3 May 2012 21:36:03 +0000 (-0500)
Subject: vol: Free vol header on attach_volume_header error
X-Git-Tag: upstream/1.6.2_pre2^2~176
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=78020ab61e4d2a8753c847ea731a1d31c7200571;p=packages%2Fo%2Fopenafs.git

vol: Free vol header on attach_volume_header error

In attach_volume_header, make sure we free the volume's header if
we're returning an error. We take care of the locks and i/o handles in
the immediately preceding block, but for an actual error we don't get
rid of the header. Do so.

Noticed by Tom Keiser.

Reviewed-on: http://gerrit.openafs.org/7325
Reviewed-by: Tom Keiser <tkeiser@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit ecfd9549fc29cdad8042e830c656caee1363c6cf)

Change-Id: I1d49c18f23cd576dfcde114238ea2b41e1356039
Reviewed-on: http://gerrit.openafs.org/7492
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 8599c59de..fca12561c 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -3005,6 +3005,9 @@ attach_volume_header(Error *ec, Volume *vp, struct DiskPartition64 *partp,
     }
 
     if (*ec) {
+	VOL_LOCK;
+	FreeVolumeHeader(vp);
+	VOL_UNLOCK;
 	return;
     }
     if (retry) {