From: Mark Vitale <mvitale@sinenomine.net>
Date: Wed, 11 May 2016 02:51:38 +0000 (-0400)
Subject: salvageserver: segfault in DoSalvageVolume
X-Git-Tag: upstream/1.8.0_pre1^2~84
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bf17a719e3443502e2b4bdb7f6b9d2f0c1e39510;p=packages%2Fo%2Fopenafs.git

salvageserver: segfault in DoSalvageVolume

A typo in the recent logging changes for salvageserver
ad455347bc99d1bd499535995958b5f77c2388ff
caused a bad address to be passed to memset.

Correctly memset the log options as intended.

Change-Id: Ifef46defcc6da56df4e58f8ed9029717a77c0b39
Reviewed-on: https://gerrit.openafs.org/12282
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index 6e4c87a0f..f513ce3fc 100644
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -621,7 +621,7 @@ DoSalvageVolume(struct SalvageQueueNode * node, int slot)
      * another thread may have held the lock when fork was
      * called!
      */
-    memset(&memset, 0, sizeof(logopts));
+    memset(&logopts, 0, sizeof(logopts));
     logopts.lopt_dest = logDest_file;
     logopts.lopt_rotateStyle = logRotate_none;
     if (asprintf(&filename, "%s.%d",