From owner-svn-soc-all@FreeBSD.ORG  Thu Jun 26 21:07:54 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D897F724
 for <svn-soc-all@FreeBSD.org>; Thu, 26 Jun 2014 21:07:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C57D428A3
 for <svn-soc-all@FreeBSD.org>; Thu, 26 Jun 2014 21:07:54 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QL7sVU092819
 for <svn-soc-all@FreeBSD.org>; Thu, 26 Jun 2014 21:07:54 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5QL7sCc092817
 for svn-soc-all@FreeBSD.org; Thu, 26 Jun 2014 21:07:54 GMT
 (envelope-from def@FreeBSD.org)
Date: Thu, 26 Jun 2014 21:07:54 GMT
Message-Id: <201406262107.s5QL7sCc092817@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: r270100 - soc2013/def/crashdump-head/sys/kern
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.18
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: Thu, 26 Jun 2014 21:07:54 -0000

Author: def
Date: Thu Jun 26 21:07:53 2014
New Revision: 270100
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270100

Log:
  Use error numbers in dump_encrypted_write.
  

Modified:
  soc2013/def/crashdump-head/sys/kern/kern_shutdown.c

Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Thu Jun 26 20:12:38 2014	(r270099)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Thu Jun 26 21:07:53 2014	(r270100)
@@ -885,7 +885,7 @@
 	/* Data have to be written one after another. */
 	if (kdb->offset != 0 && kdb->offset != offset &&
 	    kdb->offset + kdb->used != offset) {
-		return (-1);
+		return (EINVAL);
 	}
 
 	/* Write kernel dump headers. */
@@ -904,11 +904,11 @@
 		error = rijndael_blockEncrypt(&kdk->ci, &kdk->ki, kdb->buf,
 		    KERNELDUMP_BUFFER_SIZE * 8, kdb->buf);
 		if (error <= 0)
-			return (-1);
+			return (EIO);
 		error = rijndael_cipherInit(&kdk->ci, MODE_CBC, kdb->buf +
 		    KERNELDUMP_BUFFER_SIZE - KERNELDUMP_IV_SIZE);
 		if (error <= 0)
-			return (-1);
+			return (EIO);
 
 		error = di->dumper(di->priv, kdb->buf, physical, kdb->offset,
 		    KERNELDUMP_BUFFER_SIZE);