| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 23 Feb 2010 09:16:27 -0500
From: Stephen Smalley <sds@...ho.nsa.gov>
To: wzt.wzt@...il.com
Cc: linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org,
James Morris <jmorris@...ei.org>
Subject: Re: [PATCH] Security: add static to security_ops and
default_security_ops variable
On Tue, 2010-02-23 at 23:15 +0800, wzt.wzt@...il.com wrote:
> I resent this patch using mutt, thanks for your helping:)
>
> Enhance the security framework to support resetting the active security
> module. This eliminates the need for direct use of the security_ops and
> default_security_ops variables outside of security.c, so make security_ops
> and default_security_ops static. Also remove the secondary_ops variable as
> a cleanup since there is no use for that. secondary_ops was originally used by
> SELinux to call the "secondary" security module (capability or dummy),
> but that was replaced by direct calls to capability and the only
> remaining use is to save and restore the original security ops pointer
> value if SELinux is disabled by early userspace based on /etc/selinux/config.
> Further, if we support this directly in the security framework, then we can
> just use &default_security_ops for this purpose since that is now available.
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@...baba-inc.com>
Acked-by: Stephen Smalley <sds@...ho.nsa.gov>
>
> ---
> include/linux/security.h | 2 ++
> security/capability.c | 4 ----
> security/security.c | 11 +++++++++--
> security/selinux/hooks.c | 13 +------------
> 4 files changed, 12 insertions(+), 18 deletions(-)
>
> diff --git a/include/linux/security.h b/include/linux/security.h
> index 2c627d3..8cbc714 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -95,6 +95,8 @@ struct seq_file;
> extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
> extern int cap_netlink_recv(struct sk_buff *skb, int cap);
>
> +void reset_security_ops(void);
> +
> #ifdef CONFIG_MMU
> extern unsigned long mmap_min_addr;
> extern unsigned long dac_mmap_min_addr;
> diff --git a/security/capability.c b/security/capability.c
> index 5c700e1..4875142 100644
> --- a/security/capability.c
> +++ b/security/capability.c
> @@ -906,10 +906,6 @@ static void cap_audit_rule_free(void *lsmrule)
> }
> #endif /* CONFIG_AUDIT */
>
> -struct security_operations default_security_ops = {
> - .name = "default",
> -};
> -
> #define set_to_cap_if_null(ops, function) \
> do { \
> if (!ops->function) { \
> diff --git a/security/security.c b/security/security.c
> index 122b748..663b630 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -23,10 +23,12 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
> CONFIG_DEFAULT_SECURITY;
>
> /* things that live in capability.c */
> -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;
> +static struct security_operations default_security_ops = {
> + .name = "default",
> +};
>
> static inline int verify(struct security_operations *ops)
> {
> @@ -63,6 +65,11 @@ int __init security_init(void)
> return 0;
> }
>
> +void reset_security_ops(void)
> +{
> + security_ops = &default_security_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..1cbf18f 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -125,13 +125,6 @@ __setup("selinux=", selinux_enabled_setup);
> 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 +5665,6 @@ 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");
> if (register_security(&selinux_ops))
> panic("SELinux: Unable to register with kernel.\n");
>
> @@ -5835,8 +5825,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();
--
Stephen Smalley
National Security Agency
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists