aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYevgeny Pats2016-01-19 16:09:04 -0600
committerGreg Kroah-Hartman2016-01-31 13:28:53 -0600
commite4a46f02b1d0eaadea4e6b00e29922cd00d6de53 (patch)
tree2c34f33f5127cc01159ec05400118172ee85f9b8 /security
parentafd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff)
downloadkernel-omap-e4a46f02b1d0eaadea4e6b00e29922cd00d6de53.tar.gz
kernel-omap-e4a46f02b1d0eaadea4e6b00e29922cd00d6de53.tar.xz
kernel-omap-e4a46f02b1d0eaadea4e6b00e29922cd00d6de53.zip
KEYS: Fix keyring ref leak in join_session_keyring()
commit 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 upstream. This fixes CVE-2016-0728. If a thread is asked to join as a session keyring the keyring that's already set as its session, we leak a keyring reference. This can be tested with the following program: #include <stddef.h> #include <stdio.h> #include <sys/types.h> #include <keyutils.h> int main(int argc, const char *argv[]) { int i = 0; key_serial_t serial; serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, "leaked-keyring"); if (serial < 0) { perror("keyctl"); return -1; } if (keyctl(KEYCTL_SETPERM, serial, KEY_POS_ALL | KEY_USR_ALL) < 0) { perror("keyctl"); return -1; } for (i = 0; i < 100; i++) { serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, "leaked-keyring"); if (serial < 0) { perror("keyctl"); return -1; } } return 0; } If, after the program has run, there something like the following line in /proc/keys: 3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty with a usage count of 100 * the number of times the program has been run, then the kernel is malfunctioning. If leaked-keyring has zero usages or has been garbage collected, then the problem is fixed. Reported-by: Yevgeny Pats <yevgeny@perception-point.io> Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Don Zickus <dzickus@redhat.com> Acked-by: Prarit Bhargava <prarit@redhat.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/keys/process_keys.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a3f85d2a00bb..e6d50172872f 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
794 ret = PTR_ERR(keyring); 794 ret = PTR_ERR(keyring);
795 goto error2; 795 goto error2;
796 } else if (keyring == new->session_keyring) { 796 } else if (keyring == new->session_keyring) {
797 key_put(keyring);
797 ret = 0; 798 ret = 0;
798 goto error2; 799 goto error2;
799 } 800 }