[arch-commits] Commit in linux/repos/core-i686 (CVE-2016-0728.patch PKGBUILD)
Tobias Powalowski
tpowa at archlinux.org
Wed Jan 20 06:14:00 UTC 2016
Date: Wednesday, January 20, 2016 @ 07:14:00
Author: tpowa
Revision: 258431
fix #47820 CVE-2016-0728
Added:
linux/repos/core-i686/CVE-2016-0728.patch
Modified:
linux/repos/core-i686/PKGBUILD
---------------------+
CVE-2016-0728.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 6 +++
2 files changed, 83 insertions(+), 1 deletion(-)
Added: CVE-2016-0728.patch
===================================================================
--- CVE-2016-0728.patch (rev 0)
+++ CVE-2016-0728.patch 2016-01-20 06:14:00 UTC (rev 258431)
@@ -0,0 +1,78 @@
+From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001
+From: Yevgeny Pats <yevgeny at perception-point.io>
+Date: Tue, 19 Jan 2016 22:09:04 +0000
+Subject: [PATCH] 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 at perception-point.io>
+Signed-off-by: David Howells <dhowells at redhat.com>
+Acked-by: Don Zickus <dzickus at redhat.com>
+Acked-by: Prarit Bhargava <prarit at redhat.com>
+Acked-by: Jarod Wilson <jarod at redhat.com>
+Signed-off-by: James Morris <james.l.morris at oracle.com>
+---
+ security/keys/process_keys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
+index a3f85d2a..e6d50172 100644
+--- a/security/keys/process_keys.c
++++ b/security/keys/process_keys.c
+@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
+ ret = PTR_ERR(keyring);
+ goto error2;
+ } else if (keyring == new->session_keyring) {
++ key_put(keyring);
+ ret = 0;
+ goto error2;
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-20 06:12:11 UTC (rev 258430)
+++ PKGBUILD 2016-01-20 06:14:00 UTC (rev 258431)
@@ -21,7 +21,8 @@
'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
'linux.preset'
- 'change-default-console-loglevel.patch')
+ 'change-default-console-loglevel.patch'
+ 'CVE-2016-0728.patch')
sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
'SKIP'
@@ -48,6 +49,9 @@
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+ # fixes #47820 CVE-2016-0728.patch
+ patch -Np1 -i "${srcdir}/CVE-2016-0728.patch"
+
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
More information about the arch-commits
mailing list