From owner-svn-soc-all@FreeBSD.ORG  Mon Sep 23 16:04:32 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4D2E730C
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 16:04:32 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A6C72736
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 16:04:32 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NG4WAQ038149
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 16:04:32 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8NG4WJB038141
 for svn-soc-all@FreeBSD.org; Mon, 23 Sep 2013 16:04:32 GMT
 (envelope-from def@FreeBSD.org)
Date: Mon, 23 Sep 2013 16:04:32 GMT
Message-Id: <201309231604.r8NG4WJB038141@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r257649 - soc2013/def/crashdump-head/sbin/savecore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Sep 2013 16:04:32 -0000

Author: def
Date: Mon Sep 23 16:04:31 2013
New Revision: 257649
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257649

Log:
  Review savecore(8).

Modified:
  soc2013/def/crashdump-head/sbin/savecore/Makefile
  soc2013/def/crashdump-head/sbin/savecore/dumpfile.c

Modified: soc2013/def/crashdump-head/sbin/savecore/Makefile
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/Makefile	Mon Sep 23 15:41:39 2013	(r257648)
+++ soc2013/def/crashdump-head/sbin/savecore/Makefile	Mon Sep 23 16:04:31 2013	(r257649)
@@ -7,7 +7,6 @@
 DPADD=	${LIBZ}
 LDADD=	-lz
 CFLAGS+=-I${SYS}
-WARNS?=	2
 MAN=	savecore.8
 
 .include <bsd.prog.mk>

Modified: soc2013/def/crashdump-head/sbin/savecore/dumpfile.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Sep 23 15:41:39 2013	(r257648)
+++ soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Sep 23 16:04:31 2013	(r257649)
@@ -44,12 +44,15 @@
 
 	fd = (dumpFile *)malloc(sizeof(dumpFile));
 	fd->fp = fp;
+	fd->buf_used = 0;
 
 	memcpy(fd->encrypted_key, h->encrypted_key, KERNELDUMP_ENCRYPTED_KEY_SIZE);
 
-	save_key_for(fd, keyname);
+	if (save_key_for(fd, keyname)) {
+		free(fd);
 
-	fd->buf_used = 0;
+		return (NULL);
+	}
 
 	return (funopen(fd, NULL, dwrite, NULL, dclose));
 }
@@ -67,8 +70,11 @@
 		memcpy(fd->buf + fd->buf_used, data, resid);
 		fd->buf_used += resid;
 
-		if (fwrite(fd->buf, 1, PEFS_SECTOR_SIZE, fd->fp) != PEFS_SECTOR_SIZE)
-			return (0);
+		if (fwrite(fd->buf, 1, PEFS_SECTOR_SIZE, fd->fp) != PEFS_SECTOR_SIZE) {
+			fd->buf_used -= resid;
+
+			return (saved);
+		}
 
 		data += resid;
 		size -= resid;