Module Name: src
Committed By: riastradh
Date: Fri Jul 28 14:13:56 UTC 2017
Modified Files:
src/sys/opencrypto: ocryptodev.c
Log Message:
Don't disclose uninitialized 32-bit word if cryptodev_session fails.
>From Ilja Van Sprundel.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/opencrypto/ocryptodev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.8 src/sys/opencrypto/ocryptodev.c:1.9
--- src/sys/opencrypto/ocryptodev.c:1.8 Fri Jun 2 09:46:57 2017
+++ src/sys/opencrypto/ocryptodev.c Fri Jul 28 14:13:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.8 2017/06/02 09:46:57 knakahara Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.9 2017/07/28 14:13:56 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.8 2017/06/02 09:46:57 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.9 2017/07/28 14:13:56 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,8 +245,10 @@ ocryptodev_session(struct fcrypt *fcr, s
sop.mackeylen = osop->mackeylen;
sop.mackey = osop->mackey;
res = cryptodev_session(fcr, &sop);
+ if (res)
+ return res;
osop->ses = sop.ses;
- return res;
+ return 0;
}
