CVS commit: src/sys/secmodel/securelevel

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Thu May 28 23:17:25 UTC 2020

Modified Files:
        src/sys/secmodel/securelevel: secmodel_securelevel.c

Log Message:
Accept ioctl(RNDADDDATA) estimates at securelevel 1 (but not 2).

securelevel=1 is supposed to be a reasonable default for normal
computers.  This got in the way of ever getting entropy from a seed
on a machine with no HWRNG -- e.g., from another machine, or by
making the executive decision that what has been sampled is good
enough and issuing `head -c 32 < /dev/urandom > /dev/random'.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
    src/sys/secmodel/securelevel/secmodel_securelevel.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/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.35 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.36
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.35	Mon May 11 19:36:39 2020
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c	Thu May 28 23:17:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.35 2020/05/11 19:36:39 alnsn Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.35 2020/05/11 19:36:39 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_insecure.h"
@@ -593,7 +593,7 @@ secmodel_securelevel_device_cb(kauth_cre
 		break;
 
 	case KAUTH_DEVICE_RND_ADDDATA_ESTIMATE:
-		if (securelevel > 0)
+		if (securelevel > 1)
 			result = KAUTH_RESULT_DENY;
 		break;