SELinux: Remove unused selinux_is_enabled
There are no longer users of selinux_is_enabled(). Remove it. As selinux_is_enabled() is the only reason for include/linux/selinux.h remove that as well. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
parent
98c8865136
commit
3d25252948
@ -15,7 +15,6 @@
|
|||||||
#include <linux/capability.h>
|
#include <linux/capability.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/key.h>
|
#include <linux/key.h>
|
||||||
#include <linux/selinux.h>
|
|
||||||
#include <linux/atomic.h>
|
#include <linux/atomic.h>
|
||||||
#include <linux/uidgid.h>
|
#include <linux/uidgid.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* SELinux services exported to the rest of the kernel.
|
|
||||||
*
|
|
||||||
* Author: James Morris <jmorris@redhat.com>
|
|
||||||
*
|
|
||||||
* Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>
|
|
||||||
* Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel@trustedcs.com>
|
|
||||||
* Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim@us.ibm.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2,
|
|
||||||
* as published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
#ifndef _LINUX_SELINUX_H
|
|
||||||
#define _LINUX_SELINUX_H
|
|
||||||
|
|
||||||
struct selinux_audit_rule;
|
|
||||||
struct audit_context;
|
|
||||||
struct kern_ipc_perm;
|
|
||||||
|
|
||||||
#ifdef CONFIG_SECURITY_SELINUX
|
|
||||||
|
|
||||||
/**
|
|
||||||
* selinux_is_enabled - is SELinux enabled?
|
|
||||||
*/
|
|
||||||
bool selinux_is_enabled(void);
|
|
||||||
#else
|
|
||||||
|
|
||||||
static inline bool selinux_is_enabled(void)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_SECURITY_SELINUX */
|
|
||||||
|
|
||||||
#endif /* _LINUX_SELINUX_H */
|
|
@ -6,7 +6,7 @@
|
|||||||
obj-$(CONFIG_SECURITY_SELINUX) := selinux.o
|
obj-$(CONFIG_SECURITY_SELINUX) := selinux.o
|
||||||
|
|
||||||
selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
|
selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
|
||||||
netnode.o netport.o ibpkey.o exports.o \
|
netnode.o netport.o ibpkey.o \
|
||||||
ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
|
ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
|
||||||
ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o
|
ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o
|
||||||
|
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* SELinux services exported to the rest of the kernel.
|
|
||||||
*
|
|
||||||
* Author: James Morris <jmorris@redhat.com>
|
|
||||||
*
|
|
||||||
* Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>
|
|
||||||
* Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel@trustedcs.com>
|
|
||||||
* Copyright (C) 2006 IBM Corporation, Timothy R. Chavez <tinytim@us.ibm.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2,
|
|
||||||
* as published by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/selinux.h>
|
|
||||||
|
|
||||||
#include "security.h"
|
|
||||||
|
|
||||||
bool selinux_is_enabled(void)
|
|
||||||
{
|
|
||||||
return selinux_enabled;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(selinux_is_enabled);
|
|
@ -79,7 +79,6 @@
|
|||||||
#include <linux/personality.h>
|
#include <linux/personality.h>
|
||||||
#include <linux/audit.h>
|
#include <linux/audit.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/selinux.h>
|
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/posix-timers.h>
|
#include <linux/posix-timers.h>
|
||||||
#include <linux/syslog.h>
|
#include <linux/syslog.h>
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* SELinux support for the Audit LSM hooks
|
* SELinux support for the Audit LSM hooks
|
||||||
*
|
*
|
||||||
* Most of below header was moved from include/linux/selinux.h which
|
|
||||||
* is released under below copyrights:
|
|
||||||
*
|
|
||||||
* Author: James Morris <jmorris@redhat.com>
|
* Author: James Morris <jmorris@redhat.com>
|
||||||
*
|
*
|
||||||
* Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>
|
* Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris@redhat.com>
|
||||||
|
@ -49,7 +49,6 @@
|
|||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/audit.h>
|
#include <linux/audit.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/selinux.h>
|
|
||||||
#include <linux/flex_array.h>
|
#include <linux/flex_array.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
#include <net/netlabel.h>
|
#include <net/netlabel.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user