From: wzt wzt <wzt.wzt@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: sds@tycho.nsa.gov, jmorris@namei.org, eparis@parisplace.org
Subject: [PATCH] LSM: add static to security_ops variable
Date: Sun, 7 Feb 2010 19:24:44 +0800 [thread overview]
Message-ID: <628d1651002070324w424012eanda9392db26331905@mail.gmail.com> (raw)
security_ops was declared as a global variable, so other drivers or
kernel code can easily change its value, like:
extern struct security_operations *security_ops;
security_ops = NULL;
then insmod this driver immediately, it will get an oops. Other evil
drivers can aslo fake this variable as extern.
Signed-off-by: wzt <zhitong.wangzt@alibaba-inc.com>
---
security/security.c | 25 ++++++++++++++++++++++++-
security/selinux/hooks.c | 18 ++++++------------
2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/security/security.c b/security/security.c
index 24e060b..781117d 100644
--- a/security/security.c
+++ b/security/security.c
@@ -26,7 +26,12 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
extern struct security_operations default_security_ops;
extern void security_fixup_ops(struct security_operations *ops);
-struct security_operations *security_ops; /* Initialized to NULL */
+static struct security_operations *security_ops; /* Initialized
to NULL */
+/*
+ * Minimal support for a secondary security module,
+ * just to allow the use of the capability module.
+ */
+static struct security_operations *secondary_ops;
static inline int verify(struct security_operations *ops)
{
@@ -63,6 +68,24 @@ int __init security_init(void)
return 0;
}
+void reset_secondary_ops(void)
+{
+ secondary_ops = security_ops;
+ if (!secondary_ops)
+ panic("SELinux: No initial security operations\n");
+}
+
+void reset_security_ops(void)
+{
+ /* Reset security_ops to the secondary module, dummy or capability. */
+ security_ops = secondary_ops;
+}
/* Save user chosen LSM */
static int __init choose_lsm(char *str)
{
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9a2ee84..9e8607e 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -92,7 +92,9 @@
#define NUM_SEL_MNT_OPTS 5
extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
-extern struct security_operations *security_ops;
+extern void reset_secondary_ops(void);
+extern void reset_security_ops(void);
/* SECMARK reference count */
atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
@@ -126,12 +128,6 @@ int selinux_enabled = 1;
#endif
-/*
- * Minimal support for a secondary security module,
- * just to allow the use of the capability module.
- */
-static struct security_operations *secondary_ops;
-
/* Lists of inode and superblock security structures initialized
before the policy was loaded. */
static LIST_HEAD(superblock_security_head);
@@ -5672,9 +5668,8 @@ static __init int selinux_init(void)
0, SLAB_PANIC, NULL);
avc_init();
- secondary_ops = security_ops;
- if (!secondary_ops)
- panic("SELinux: No initial security operations\n");
+ reset_secondary_ops();
+
if (register_security(&selinux_ops))
panic("SELinux: Unable to register with kernel.\n");
@@ -5835,8 +5830,7 @@ int selinux_disable(void)
selinux_disabled = 1;
selinux_enabled = 0;
- /* Reset security_ops to the secondary module, dummy or capability. */
- security_ops = secondary_ops;
+ reset_security_ops();
/* Try to destroy the avc node cache */
avc_disable();
--
1.6.6.1
next reply other threads:[~2010-02-07 11:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-07 11:24 wzt wzt [this message]
2010-02-07 14:14 ` Greg KH
2010-02-16 14:57 ` Stephen Smalley
2010-02-19 11:40 ` wzt wzt
2010-02-19 13:47 ` Stephen Smalley
2010-02-19 11:44 ` Alexey Dobriyan
2010-02-19 11:57 ` wzt wzt
2010-02-19 12:02 ` Alexey Dobriyan
2010-02-19 12:23 ` wzt wzt
2010-02-19 12:27 ` Alexey Dobriyan
2010-02-19 13:14 ` wzt wzt
2010-02-19 13:12 ` Bernd Petrovitsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=628d1651002070324w424012eanda9392db26331905@mail.gmail.com \
--to=wzt.wzt@gmail.com \
--cc=eparis@parisplace.org \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®