[src/trunk]: src/sys/secmodel Re-instate backwards compatible security.models...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/97e194e5453d
branches:  trunk
changeset: 784412:97e194e5453d
user:      jym <jym%NetBSD.org@localhost>
date:      Mon Jan 28 00:51:29 2013 +0000

description:
Re-instate backwards compatible security.models.bsd44.{curtain,securelevel}.

They were mistakenly removed when curtain and securelevel moved to
secmodel_extensions(9).

Reported by tls@ on tech-security@.

XXX will ask for pull-up for -6.

diffstat:

 sys/secmodel/extensions/secmodel_extensions.c   |  23 ++++++++++++++++++++---
 sys/secmodel/securelevel/secmodel_securelevel.c |  22 +++++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diffs (101 lines):

diff -r 6a4920a7a653 -r 97e194e5453d sys/secmodel/extensions/secmodel_extensions.c
--- a/sys/secmodel/extensions/secmodel_extensions.c     Mon Jan 28 00:23:18 2013 +0000
+++ b/sys/secmodel/extensions/secmodel_extensions.c     Mon Jan 28 00:51:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_extensions.c,v 1.3 2012/03/13 18:41:01 elad Exp $ */
+/* $NetBSD: secmodel_extensions.c,v 1.4 2013/01/28 00:51:29 jym Exp $ */
 /*-
  * Copyright (c) 2011 Elad Efrat <elad%NetBSD.org@localhost>
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_extensions.c,v 1.3 2012/03/13 18:41:01 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_extensions.c,v 1.4 2013/01/28 00:51:29 jym Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -73,7 +73,7 @@
 static void
 sysctl_security_extensions_setup(struct sysctllog **clog)
 {
-       const struct sysctlnode *rnode;
+       const struct sysctlnode *rnode, *rnode2;
 
        sysctl_createv(clog, 0, NULL, &rnode,
                       CTLFLAG_PERMANENT,
@@ -87,6 +87,23 @@
                       NULL, 0, NULL, 0,
                       CTL_CREATE, CTL_EOL);
 
+       /* Compatibility: security.models.bsd44 */
+       rnode2 = rnode;
+       sysctl_createv(clog, 0, &rnode2, &rnode2,
+                      CTLFLAG_PERMANENT,
+                      CTLTYPE_NODE, "bsd44", NULL,
+                      NULL, 0, NULL, 0,
+                      CTL_CREATE, CTL_EOL);
+
+        /* Compatibility: security.models.bsd44.curtain */
+       sysctl_createv(clog, 0, &rnode2, NULL,
+                      CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+                      CTLTYPE_INT, "curtain",
+                      SYSCTL_DESCR("Curtain information about objects to "\
+                                   "users not owning them."),
+                      sysctl_extensions_curtain_handler, 0, &curtain, 0,
+                      CTL_CREATE, CTL_EOL);
+
        sysctl_createv(clog, 0, &rnode, &rnode,
                       CTLFLAG_PERMANENT,
                       CTLTYPE_NODE, "extensions", NULL,
diff -r 6a4920a7a653 -r 97e194e5453d sys/secmodel/securelevel/secmodel_securelevel.c
--- a/sys/secmodel/securelevel/secmodel_securelevel.c   Mon Jan 28 00:23:18 2013 +0000
+++ b/sys/secmodel/securelevel/secmodel_securelevel.c   Mon Jan 28 00:51:29 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.28 2012/06/27 10:15:25 cheusov Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.29 2013/01/28 00:51:30 jym Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad%NetBSD.org@localhost>
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.28 2012/06/27 10:15:25 cheusov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.29 2013/01/28 00:51:30 jym Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_insecure.h"
@@ -95,7 +95,7 @@
 void
 sysctl_security_securelevel_setup(struct sysctllog **clog)
 {
-       const struct sysctlnode *rnode;
+       const struct sysctlnode *rnode, *rnode2;
 
        sysctl_createv(clog, 0, NULL, &rnode,
                       CTLFLAG_PERMANENT,
@@ -109,6 +109,22 @@
                       NULL, 0, NULL, 0,
                       CTL_CREATE, CTL_EOL);
 
+       /* Compatibility: security.models.bsd44 */
+       rnode2 = rnode;
+       sysctl_createv(clog, 0, &rnode2, &rnode2,
+                      CTLFLAG_PERMANENT,
+                      CTLTYPE_NODE, "bsd44", NULL,
+                      NULL, 0, NULL, 0,
+                      CTL_CREATE, CTL_EOL);
+
+        /* Compatibility: security.models.bsd44.securelevel */
+       sysctl_createv(clog, 0, &rnode2, NULL,
+                      CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+                      CTLTYPE_INT, "securelevel",
+                      SYSCTL_DESCR("System security level"),
+                      secmodel_securelevel_sysctl, 0, NULL, 0,
+                      CTL_CREATE, CTL_EOL);
+
        sysctl_createv(clog, 0, &rnode, &rnode,
                       CTLFLAG_PERMANENT,
                       CTLTYPE_NODE, "securelevel", NULL,