socsvn commit: r270100 - soc2013/def/crashdump-head/sys/kern

def at FreeBSD.org def at FreeBSD.org
Thu Jun 26 21:07:54 UTC 2014


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);


More information about the svn-soc-all mailing list