diff options
| author | Serge E. Hallyn <serge@hallyn.com> | 2011-05-26 15:25:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-03 09:32:33 +0900 |
| commit | 82ce79999abf4899b10481209db7f0af8057a561 (patch) | |
| tree | 88b73381135250bafc3a1cba1468f53ae1b412ae | |
| parent | 39b4e54266a625a141dac11c7bd22729b00c94d7 (diff) | |
| download | linux-stable-82ce79999abf4899b10481209db7f0af8057a561.tar.gz linux-stable-82ce79999abf4899b10481209db7f0af8057a561.tar.bz2 linux-stable-82ce79999abf4899b10481209db7f0af8057a561.zip | |
Set cred->user_ns in key_replace_session_keyring
commit f7285b5d631fd6096b11c6af0058ed3a2b30ef4e upstream.
Since this cred was not created with copy_creds(), it needs to get
initialized. Otherwise use of syscall(__NR_keyctl, KEYCTL_SESSION_TO_PARENT);
can lead to a NULL deref. Thanks to Robert for finding this.
But introduced by commit 47a150edc2a ("Cache user_ns in struct cred").
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Reported-by: Robert Święcki <robert@swiecki.net>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | security/keys/process_keys.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 930634e45149..7a0c5868651f 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -845,6 +845,7 @@ void key_replace_session_keyring(void) new-> sgid = old-> sgid; new->fsgid = old->fsgid; new->user = get_uid(old->user); + new->user_ns = new->user->user_ns; new->group_info = get_group_info(old->group_info); new->securebits = old->securebits; |