[arch-commits] Commit in linux-lts/trunk (CVE-2016-0728.patch PKGBUILD)

[Andreas Radke]

    Date: Wednesday, January 20, 2016 @ 18:13:13
  Author: andyrtr
Revision: 258447

upgpkg: linux-lts 4.1.15-2

patch CVE-2016-0728; FS#47831

Added:
  linux-lts/trunk/CVE-2016-0728.patch
Modified:
  linux-lts/trunk/PKGBUILD

---------------------+
 CVE-2016-0728.patch |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD            |   11 +++++--
 2 files changed, 86 insertions(+), 3 deletions(-)

Added: CVE-2016-0728.patch
===================================================================
--- CVE-2016-0728.patch	                        (rev 0)
+++ CVE-2016-0728.patch	2016-01-20 17:13:13 UTC (rev 258447)
@@ -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 14:58:32 UTC (rev 258446)
+++ PKGBUILD	2016-01-20 17:13:13 UTC (rev 258447)
@@ -4,7 +4,7 @@
 pkgbase=linux-lts
 _srcname=linux-4.1
 pkgver=4.1.15
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -16,7 +16,8 @@
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "$pkgbase.preset"
-        change-default-console-loglevel.patch)
+        change-default-console-loglevel.patch
+        CVE-2016-0728.patch)
 # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
             'SKIP'
@@ -25,7 +26,8 @@
             '4f33208934694268c146b036e3a6e0688e8326740ca42754875c644e7aedd4c2'
             '31fa759c3b91f4a0bed69112eaec9c3a5648905e25cb0986e61f535ec798b291'
             '1f036f7464da54ae510630f0edb69faa115287f86d9f17641197ffda8cfd49e0'
-            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            '03bed5b1c6ef34a917e218a46d38cd1347c5ab5693131996113c6cad275dc4e9')
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds at linux-foundation.org>
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg at kroah.com>
              )
@@ -37,6 +39,9 @@
   # add upstream patch
   patch -p1 -i "${srcdir}/patch-${pkgver}"
 
+  # fixes #47831 CVE-2016-0728.patch
+  patch -Np1 -i "${srcdir}/CVE-2016-0728.patch"
+
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git