Fix CVE-2016-0728

3 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb2e6e27a6e1..9b6a6b23f745 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan 19 21:05:20 UTC 2016
+# Wed Jan 20 14:26:15 UTC 2016
 pkgbase = linux-bfq
 	pkgver = 4.3.3
-	pkgrel = 3
+	pkgrel = 4
 	url = http://algo.ing.unimo.it
 	arch = i686
 	arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = linux-bfq
 	source = config
 	source = config.x86_64
 	source = 0004-disabling-primary-plane-in-the-noatomic-case.patch
-	source = 0005-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+	source = CVE-2016-0728.patch
 	sha512sums = d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc
 	sha512sums = SKIP
 	sha512sums = 1b9cc343a589a7cdaa66284b3d7129be9869195f5b839dac0222050af42dc7a7451d4e2bf176c1a9939d6572a44a9b6f4534b0c7a79032881a9bc8f8f56c9c69
@@ -38,7 +38,7 @@ pkgbase = linux-bfq
 	sha512sums = 2a55cf35899b4b6b9f4a4a6d3d39d0f7843954a3b1a57fd28d999e0dcc963cbf411884dfcfd49c671714202745e9c53db9df12f8eab9e98be0b5fade9503c644
 	sha512sums = 07cccbb594033de456ab24c7e8259f35a198a6a1af3fb9467eef5ae78626750a86ee71ef42a1560825f6f5ef2ecd6a9223c3cd8431d8744c6f1d67e25eb7c35c
 	sha512sums = 9e5d95f695bcb5858f8ace8f2f2bf2981b22f46cdbc06453b643ee26c38fdaaf8d487b65249e73a8cbcfc2360c65fd970601aec2358e91f14614d227cf33de1a
-	sha512sums = 1054749d778176ba3f20a1e4089f8bbee376cb1a5760267b202bdef3b4b2b88c5c4337a7e346a8444132ce26e21151362290dd53bd8bcdee8903a512cf293c70
+	sha512sums = 52a4c7bedaf369371b8ba081cc255c6afc04a096c1d345ff7ef4e60631243a1ca20ea6464f708a3ed330ed9c2826dd895eeb1d84a230b6d5d07564000c8f455d
 
 pkgname = linux-bfq
 	pkgdesc = Linux Kernel and modules with the BFQ scheduler.
diff --git a/0005-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/CVE-2016-0728.patch
index ba9f517d4c88..e915d8219e1a 100644
--- a/0005-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+++ b/CVE-2016-0728.patch
@@ -1,7 +1,9 @@
-From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001
+From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001
 From: Yevgeny Pats <yevgeny@perception-point.io>
-Date: Mon, 11 Jan 2016 12:05:28 +0000
-Subject: KEYS: Fix keyring ref leak in join_session_keyring()
+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.
@@ -54,12 +56,16 @@ 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>
 ---
  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 a3f85d2..e6d50172 100644
+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)
@@ -70,5 +76,3 @@ index a3f85d2..e6d50172 100644
  		ret = 0;
  		goto error2;
  	}
--- 
-2.7.0.rc3
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 6ad44308d51e..42280ca2d9fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -53,7 +53,7 @@ pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
 _kernelname=-bfq
 _srcname=linux-4.3
 pkgver=4.3.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
 license=('GPL2')
@@ -76,7 +76,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'change-default-console-loglevel.patch'
         'config' 'config.x86_64'
         '0004-disabling-primary-plane-in-the-noatomic-case.patch'
-        '0005-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch')
+        'CVE-2016-0728.patch')
         
 prepare() {
     cd ${_srcname}
@@ -98,7 +98,7 @@ prepare() {
    
     ### Fix CVE-2016-0728
         msg "Fix CVE-2016-0728"
-        patch -Np1 -i "${srcdir}/0005-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch"
+        patch -Np1 -i "${srcdir}/CVE-2016-0728.patch"
 
     ### Patch source with BFQ
         msg "Patching source with BFQ patches"
@@ -454,7 +454,7 @@ sha512sums=('d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056
             '2a55cf35899b4b6b9f4a4a6d3d39d0f7843954a3b1a57fd28d999e0dcc963cbf411884dfcfd49c671714202745e9c53db9df12f8eab9e98be0b5fade9503c644'
             '07cccbb594033de456ab24c7e8259f35a198a6a1af3fb9467eef5ae78626750a86ee71ef42a1560825f6f5ef2ecd6a9223c3cd8431d8744c6f1d67e25eb7c35c'
             '9e5d95f695bcb5858f8ace8f2f2bf2981b22f46cdbc06453b643ee26c38fdaaf8d487b65249e73a8cbcfc2360c65fd970601aec2358e91f14614d227cf33de1a'
-            '1054749d778176ba3f20a1e4089f8bbee376cb1a5760267b202bdef3b4b2b88c5c4337a7e346a8444132ce26e21151362290dd53bd8bcdee8903a512cf293c70')
+            '52a4c7bedaf369371b8ba081cc255c6afc04a096c1d345ff7ef4e60631243a1ca20ea6464f708a3ed330ed9c2826dd895eeb1d84a230b6d5d07564000c8f455d')
 
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds