diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index 41a16ace6..558567cea 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -8,7 +8,7 @@ _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood" pkgver=4.3.3 srcver=${pkgver%.0} -pkgrel=1 +pkgrel=2 cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643 bfqver=v7r8 @@ -28,6 +28,7 @@ options=('!strip') source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz" 'archlinuxarm.patch' + 'kernel-CVE-2016-0728.patch' 'config' 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' '0001-disable-mv643xx_eth-TSO.patch' @@ -40,6 +41,7 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz" md5sums=('f3068333fa524ff98914cf751d0b5710' 'b91129f87c799e7184c00257eeddd2f2' + '6470e9783bd1c7a8feddc2d67f07afd5' 'cfae749ec27515f0f5b4bb3fc3b7e885' '5faf5d5f9aadf621942bd03c3b993947' '09d44b9f07abfaeaf4f688ee52034786' @@ -69,6 +71,7 @@ prepare() { msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types" patch -Np1 -i "${srcdir}/archlinuxarm.patch" + patch -Np1 -i "${srcdir}/kernel-CVE-2016-0728.patch" cp "${srcdir}/mach-types" arch/arm/tools msg2 "Add BFQ patches" diff --git a/core/linux-kirkwood/kernel-CVE-2016-0728.patch b/core/linux-kirkwood/kernel-CVE-2016-0728.patch new file mode 100644 index 000000000..49020d7db --- /dev/null +++ b/core/linux-kirkwood/kernel-CVE-2016-0728.patch @@ -0,0 +1,81 @@ +From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 +From: Yevgeny Pats +Date: Tue, 19 Jan 2016 22:09:04 +0000 +Subject: 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 + #include + #include + #include + + 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 +Signed-off-by: David Howells +Acked-by: Don Zickus +Acked-by: Prarit Bhargava +Acked-by: Jarod Wilson +Signed-off-by: James Morris +--- + 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 +--- 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; + } +-- +cgit v0.12 +