Creds: creds->security can be NULL is selinux is disabled
Subsystems (2)
PATCH 1/3 Creds: creds->security can be NULL is selinux is disabled
__validate_process_creds should check if selinux is actually enabled before running tests on the selinux portion of the credentials struct.
---
include/linux/cred.h | 13 ++++++++----- include/linux/selinux.h | 9 +++++++++ security/selinux/exports.c | 6 ++++++ 3 files changed, 23 insertions(+), 5 deletions(-)
include/linux/cred.h +8 -5
@@ -15,6 +15,7 @@#include <linux/capability.h> #include <linux/init.h> #include <linux/key.h> +#include <linux/selinux.h> #include <asm/atomic.h> struct user_struct ;
@@ -182,11 +183,13 @@ static inline bool creds_are_invalid(const struct cred *cred)if (atomic_read (&cred->usage) <atomic_read (&cred->subscribers))return true;#ifdef CONFIG_SECURITY_SELINUX -if ((unsigned long ) cred->security <PAGE_SIZE ) -return true; -if ((*(u32 *)cred->security &0xffffff00 ) == - (POISON_FREE <<24 |POISON_FREE <<16 |POISON_FREE <<8 )) -return true; +if (selinux_is_enabled ()) { +if ((unsigned long ) cred->security <PAGE_SIZE ) +return true; +if ((*(u32 *)cred->security &0xffffff00 ) == + (POISON_FREE <<24 |POISON_FREE <<16 |POISON_FREE <<8 )) +return true; + }#endif return false; }
include/linux/selinux.h +9 -0
@@ -61,6 +61,11 @@ void selinux_secmark_refcount_inc(void);* existing SECMARK targets has been removed/flushed. */ void selinux_secmark_refcount_dec (void ); + +/** +* selinux_is_enabled - is SELinux enabled? +*/ +bool selinux_is_enabled (void );#else static inline int selinux_string_to_sid (const char *str,u32 *sid)
@@ -84,6 +89,10 @@ static inline void selinux_secmark_refcount_dec(void)return ; } +static bool selinux_is_enabled (void ) +{ +return false; +}#endif /* CONFIG_SECURITY_SELINUX */ #endif /* _LINUX_SELINUX_H */
security/selinux/exports.c +6 -0
@@ -63,3 +63,9 @@ void selinux_secmark_refcount_dec(void)atomic_dec (&selinux_secmark_refcount); }EXPORT_SYMBOL_GPL (selinux_secmark_refcount_dec); + +bool selinux_is_enabled (void ) +{ +return selinux_enabled; +} +EXPORT_SYMBOL_GPL (selinux_is_enabled);
--
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.
PATCH 2/3 SELinux: seperate avc_cache flushing
Move the avc_cache flushing into it's own function so it can be reused when disabling SELinux.
---
security/selinux/avc.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-)
security/selinux/avc.c +17 -7
@@ -709,18 +709,16 @@ out: }/** -* avc_ss_reset - Flush the cache and revalidate migrated permissions. -* @seqno: policy sequence number +* avc_flush - Flush the cache */ -int avc_ss_reset (u32 seqno) +static void avc_flush (void ) { -struct avc_callback_node *c; -int i, rc =0 , tmprc; -unsigned long flag; -struct avc_node *node;struct hlist_head *head;struct hlist_node *next; +struct avc_node *node;spinlock_t *lock; +unsigned long flag; +int i;for (i =0 ; i <AVC_CACHE_SLOTS ; i++) { head = &avc_cache.slots[i];
@@ -737,6 +735,18 @@ int avc_ss_reset(u32 seqno)rcu_read_unlock ();spin_unlock_irqrestore (lock, flag); } +} + +/** +* avc_ss_reset - Flush the cache and revalidate migrated permissions. +* @seqno: policy sequence number +*/ +int avc_ss_reset (u32 seqno) +{ +struct avc_callback_node *c; +int rc =0 , tmprc; + +avc_flush ();for (c = avc_callbacks; c; c = c->next) {if (c->events &AVC_CALLBACK_RESET ) {
--
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.
PATCH 3/3 SELinux: flush the avc before disabling SELinux
In reply to Eric ParisBefore SELinux is disabled at boot it can create AVC entries. This patch will flush those entries before disabling SELinux.
---
security/selinux/avc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
security/selinux/avc.c +2 -0
@@ -868,6 +868,8 @@ u32 avc_policy_seqno(void)void avc_disable (void ) { +avc_flush (); +synchronize_rcu ();if (avc_node_cachep)kmem_cache_destroy (avc_node_cachep); }
--
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.
Quoted 2 lines · Eric Paris
__validate_process_credsshould check if selinux is actually enabled before running tests on the selinux portion of the credentials struct.
Have you verified that this fixes the problem?
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.
Quoted 6 lines · James Morris
Quoted 2 lines · Eric Paris
__validate_process_credsshould check if selinux is actually enabled before running tests on the selinux portion of the credentials struct.Have you verified that this fixes the problem?
Yes, I was able to reproduce the problem using selinux=0 at the command line. This patch fixes the problem.
-Eric
--
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.
[GIT] fix creds / SELinux regressions
In reply to Eric ParisHi Linus, please pull.
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-linus
Eric Paris (3):
Creds: creds->security can be NULL is selinux is disabled
SELinux: seperate avc_cache flushing
SELinux: flush the avc before disabling SELinux
include/linux/cred.h | 13 ++++++++----- include/linux/selinux.h | 9 +++++++++ security/selinux/avc.c | 26 +++++++++++++++++++------- security/selinux/exports.c | 6 ++++++ 4 files changed, 42 insertions(+), 12 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.
Re: [GIT] fix creds / SELinux regressions
Quoted 16 lines · James Morris
Hi Linus, please pull.
The following changes since commit
86d710146fb9975f04c505ec78caa43d227c1018:
Linus Torvalds (1):
Mergegit://git.linux-nfs.org/projects/trondmy/nfs-2.6are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6for-linusEric Paris (3):
Creds:creds->securitycan be NULL is selinux is disabled
SELinux: seperateavc_cacheflushing
SELinux: flush the avc before disabling SELinux
Quoted 5 lines
include/linux/cred.h | 13 ++++++++----- include/linux/selinux.h | 9 +++++++++ security/selinux/avc.c | 26 +++++++++++++++++++------- security/selinux/exports.c | 6 ++++++ 4 files changed, 42 insertions(+), 12 deletions(-)
Guys, _please_ do better changelogs and describe how bugs were found. It doesnt matter for me personally but these commit logs utterly lack any description about how the bugs were found/triggered, how relevant they are in practice, there's no crashlog signatures in them for people to check, no Reported-by lines, etc.
Ingo
Quoted 4 lines · Eric Paris
__validate_process_credsshould check if selinux is actually enabled before running tests on the selinux portion of the credentials struct.Signed-off-by Eric Paris <[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.