History

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.

Yevgeny Pats committed 10 years ago

Commit 23567fd1 parent d8d80381 file · +1 −0Browse files

Showing the changes to security (1 of 1 file). Show all

Unified · Split

security/keys/process_keys.c+1−0
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) · 793 unmodified lines
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 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t