Skip to content

Commit 23567fd

Browse files
Yevgeny PatsJames Morris
Yevgeny Pats
authored and
James Morris
committed
KEYS: Fix keyring ref leak in join_session_keyring()
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>
1 parent d8d8038 commit 23567fd

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: security/keys/process_keys.c

+1
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
794794
ret = PTR_ERR(keyring);
795795
goto error2;
796796
} else if (keyring == new->session_keyring) {
797+
key_put(keyring);
797798
ret = 0;
798799
goto error2;
799800
}

0 commit comments

Comments
 (0)