diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2009-09-14 20:07:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2009-09-14 20:07:31 -0700 |
| commit | 18240904960a39e582ced8ba8ececb10b8c22dd3 (patch) | |
| tree | 90cbad5533c17657969acb97a0371e41923f7f93 /kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| parent | SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX (diff) | |
| download | linux-18240904960a39e582ced8ba8ececb10b8c22dd3.tar.gz linux-18240904960a39e582ced8ba8ececb10b8c22dd3.tar.bz2 linux-18240904960a39e582ced8ba8ececb10b8c22dd3.zip | |
Merge branch 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELinux: inline selinux_is_enabled in !CONFIG_SECURITY_SELINUX
KEYS: Fix garbage collector
KEYS: Unlock tasklist when exiting early from keyctl_session_to_parent
CRED: Allow put_cred() to cope with a NULL groups list
SELinux: flush the avc before disabling SELinux
SELinux: seperate avc_cache flushing
Creds: creds->security can be NULL is selinux is disabled
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cred.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 006fcab009d5..d7f7a01082eb 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -147,7 +147,8 @@ static void put_cred_rcu(struct rcu_head *rcu) key_put(cred->thread_keyring); key_put(cred->request_key_auth); release_tgcred(cred); - put_group_info(cred->group_info); + if (cred->group_info) + put_group_info(cred->group_info); free_uid(cred->user); kmem_cache_free(cred_jar, cred); } |