From: Garrett Wollman <wollman@csail.mit.edu>
Date: Sun, 15 Jul 2012 19:13:55 +0000 (-0400)
Subject: volser: don't derefernce null pointer in copyVnodes()
X-Git-Tag: upstream/1.8.0_pre1^2~2224
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3af6beea4b03bd4dd62b23a6a0df149037b456c0;p=packages%2Fo%2Fopenafs.git

volser: don't derefernce null pointer in copyVnodes()

split_volume() can call copyVnodes() with parVnode == NULL, so guard
the one reference to parVnode (a memcpy()) to avoid a fault.

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

diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index 17e380513..1be53c2b4 100644
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -375,7 +375,8 @@ afs_int32 copyVnodes(struct Msg *m, Volume *vol, Volume *newvol,
 		    code = EIO;
 		    goto Bad_Copy;
 	        }
-	        memcpy(parVnode, vnode, sizeof(struct VnodeDiskObject));
+		if (parVnode != NULL)
+		    memcpy(parVnode, vnode, sizeof(struct VnodeDiskObject));
 	    }
 	    if (e->flag & NEEDED && e->vN != where) {
 	        VNDISK_GET_LEN(size, vnode);