Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d252529 authored by Casey Schaufler's avatar Casey Schaufler Committed by Kees Cook
Browse files

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: default avatarCasey Schaufler <casey@schaufler-ca.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 98c88651

include/linux/cred.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/capability.h>

#include <linux/init.h>

#include <linux/key.h>

#include <linux/selinux.h>

#include <linux/atomic.h>

#include <linux/uidgid.h>

#include <linux/sched.h>

include/linux/selinux.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * 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 */

security/selinux/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
obj-$(CONFIG_SECURITY_SELINUX) := selinux.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/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o

security/selinux/exports.c

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * 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);

security/selinux/hooks.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 
#include <linux/personality.h>

#include <linux/audit.h>

#include <linux/string.h>

#include <linux/selinux.h>

#include <linux/mutex.h>

#include <linux/posix-timers.h>

#include <linux/syslog.h>