diff --git a/core/linux-veyron/PKGBUILD b/core/linux-veyron/PKGBUILD index 3e645625c..568f37db5 100644 --- a/core/linux-veyron/PKGBUILD +++ b/core/linux-veyron/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=linux-veyron _kernelname=${pkgbase#linux} _desc="Veyron Chromebooks" pkgver=3.14.0 -pkgrel=17 -_commit=68cdadeae00a55d7f7151d4b3809c0ecac9db57c +pkgrel=18 +_commit=25701fb02e1d5bc6de620ccce0803e786168e3e7 arch=('armv7h') url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-3.14" license=('GPL2') @@ -21,7 +21,6 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv '0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch' '0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch' '0004-fix-brcmfmac-oops-and-race-condition.patch' - 'kernel-CVE-2016-0728.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -29,17 +28,16 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv 'cmdline' 'brcmfmac4354-sdio.txt' '99-veyron-brcm.rules') -md5sums=('c55a86280cc755b056b1417f26bd6fa0' +md5sums=('f23ed4138d7198cb6d11d9415fbf9e0a' 'bda543cb5943eac34e16d12911f3ee99' '5e2d7cd74de07d13052de99411c13a2f' '1534c1dbfe5df35a5634072f7b912840' '20f8931f3795e5226829d48c3d470334' 'e8f97028325c3999285839e521bb0f6e' '29ac9b84b8f84fbeb78ed32e049fcea5' - '6470e9783bd1c7a8feddc2d67f07afd5' '0a923f72b30570ceae127cb82a0ea432' '22ad496bbbece67f9a825a2d60d8dc25' - '04ed601ff47f6c8b6e9466735da7b32f' + '94ce8ee146f99374b07b5cd584f91a08' '9656e787504396f2cbac29c78f921bd0' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -52,7 +50,6 @@ prepare() { git apply 0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch git apply 0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch git apply 0004-fix-brcmfmac-oops-and-race-condition.patch - git apply kernel-CVE-2016-0728.patch cp config .config diff --git a/core/linux-veyron/config b/core/linux-veyron/config index fb589b7be..cae0380f9 100644 --- a/core/linux-veyron/config +++ b/core/linux-veyron/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.0-16 Kernel Configuration +# Linux/arm 3.14.0-18 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -485,7 +485,8 @@ CONFIG_NO_BOOTMEM=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_COMPACTION is not set +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_BOUNCE=y @@ -1102,7 +1103,9 @@ CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m +CONFIG_BT_HS=y CONFIG_BT_LE=y +CONFIG_BT_LEDS=y # CONFIG_BT_SELFTEST is not set CONFIG_BT_DEBUGFS=y @@ -1111,8 +1114,10 @@ CONFIG_BT_DEBUGFS=y # CONFIG_BT_INTEL=m CONFIG_BT_BCM=m +CONFIG_BT_RTL=m CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTUSB_BCM=y +CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y @@ -1120,8 +1125,9 @@ CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_3WIRE=y -CONFIG_BT_HCIUART_INTEL=y -CONFIG_BT_HCIUART_BCM=y +# CONFIG_BT_HCIUART_INTEL is not set +# CONFIG_BT_HCIUART_BCM is not set +# CONFIG_BT_HCIUART_QCA is not set CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m diff --git a/core/linux-veyron/kernel-CVE-2016-0728.patch b/core/linux-veyron/kernel-CVE-2016-0728.patch deleted file mode 100644 index 49020d7db..000000000 --- a/core/linux-veyron/kernel-CVE-2016-0728.patch +++ /dev/null @@ -1,81 +0,0 @@ -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 -