Skip to contentSkip to conversation

SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX

PATCH In review Eric Paris 3 participants 4 messages Sep 15, 2009 SELinux security module

lore
Share & tools
lore

Eric Paris

author
#0 lore raw

PATCH 1/1 SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX

Without this patch building a kernel emits millions of warning like:

include/linux/selinux.h:92: warning: ‘selinux_is_enabled’ defined but not used

When it is build without CONFIG_SECURITY_SELINUX. This is harmless, but the function should be inlined, so it gets compiled out.

---

 include/linux/selinux.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/selinux.h +1 -1
index 223d06a..82e0f26 100644
@@ -89,7 +89,7 @@ static inline void selinux_secmark_refcount_dec(void)
 	return;
 }
 
-static bool selinux_is_enabled(void)
+static inline bool selinux_is_enabled(void)
 {
 	return false;
 }

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Eric Paris

Without this patch building a kernel emits millions of warning like:

include/linux/selinux.h:92: warning: ?selinux_is_enabled? defined but not used

When it is build without CONFIG_SECURITY_SELINUX. This is harmless, but the function should be inlined, so it gets compiled out.

Linus, I'll assume you'll want to apply this directly.

Signature · 7 lines
James Morris
<[email protected]>

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.
#2 lore raw
Quoted 2 lines · James Morris

Linus, I'll assume you'll want to apply this directly.

What I want is to just get pull requests that were well tested in the first place. When I see an error in a pull request, my reaction is to just reset awat from it, and not wanting to have anything what-so-ever to do with the git tree I pulled from.

Give me a few days to get over the disgust.

Linus

#3 lore raw
Quoted 4 lines · Linus Torvalds
Quoted 1 line · James Morris
Quoted 8 lines
Quoted 1 line

Linus, I'll assume you'll want to apply this directly.

What I want is to just get pull requests that were well tested in the first place. When I see an error in a pull request, my reaction is to just reset awat from it, and not wanting to have anything what-so-ever to do with the git tree I pulled from.

Give me a few days to get over the disgust.

Sorry about this mess.

These fixes fix build problems, so here's the latest (also, I'll be on a long haul flight in a few days). Boot tested with and without SELinux enabled.

The following changes since commit 86d710146fb9975f04c505ec78caa43d227c1018:
Linus Torvalds (1):
Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 for-linus3

David Howells (2):
CRED: Allow put_cred() to cope with a NULL groups list
KEYS: Fix garbage collector

Eric Paris (4):
Creds: creds->security can be NULL is selinux is disabled
SELinux: seperate avc_cache flushing
SELinux: flush the avc before disabling SELinux
SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX

Marc Dionne (1):
KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent

 include/linux/cred.h       |   13 ++++---
 include/linux/selinux.h    |    9 +++++
 kernel/cred.c              |    3 +-
 security/keys/gc.c         |   78 ++++++++++++++++++++++++++++---------------
 security/keys/key.c        |    4 +-
 security/keys/keyctl.c     |    3 +-
 security/keys/keyring.c    |   24 +++++++++++---
 security/selinux/avc.c     |   26 +++++++++++----
 security/selinux/exports.c |    6 +++
 9 files changed, 118 insertions(+), 48 deletions(-)
Signature · 7 lines
James Morris
<[email protected]>

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.