diff options
author | Joakim Hernberg | 2017-02-21 14:29:58 +0100 |
---|---|---|
committer | Joakim Hernberg | 2017-02-21 14:29:58 +0100 |
commit | 9e6f58c991408c51d18363b4c3d670bf27e51a72 (patch) | |
tree | 3d9863494c509949140c5efbed333d26a8a60abd | |
parent | ec4bdfb47497e8550a4dd1bd80a1544b78244d06 (diff) | |
download | aur-9e6f58c991408c51d18363b4c3d670bf27e51a72.tar.gz |
bump to 4.9.11_rt9-1
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch | 46 | ||||
-rw-r--r-- | 0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch | 65 | ||||
-rw-r--r-- | PKGBUILD | 22 |
4 files changed, 66 insertions, 87 deletions
@@ -1,7 +1,7 @@ # Generated by makepkg 5.0.1 -# Sat Feb 11 21:34:41 UTC 2017 +# Tue Feb 21 13:28:59 UTC 2017 pkgbase = linux-rt - pkgver = 4.9.9_rt6 + pkgver = 4.9.11_rt9 pkgrel = 1 url = https://www.kernel.org/ arch = i686 @@ -16,17 +16,17 @@ pkgbase = linux-rt options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.9.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.9.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.9-rt6.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.9-rt6.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.11.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.11.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.11-rt9.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/older/patch-4.9.11-rt9.patch.sign source = config source = config.x86_64 source = 99-linux.hook source = linux-rt.preset source = change-default-console-loglevel.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch - source = 0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch + source = 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -34,9 +34,9 @@ pkgbase = linux-rt validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 sha256sums = 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a sha256sums = SKIP - sha256sums = ec97e3bf8585865d409a804316b276a6b4e4939286de9757f99bfb41cf112078 + sha256sums = 23e773a670f3cac11a92c4e442405dea6d2c28fea0f914ea2ba4bea313c26541 sha256sums = SKIP - sha256sums = 405eb3b607e3e483732fcb4f7cca5330e7ace8a0c0b1db238536a77401d52ae6 + sha256sums = 6d408b02b7a937ee0d20021d997320c34fa0d181ba806ddafda96b58e974b804 sha256sums = SKIP sha256sums = 88f1d3dc3e1570a4f0aae3733b5c4b666c68462c3a03550133762e5d22457fd9 sha256sums = fdc33cb2d09a9192046656285262fbca2bcab0b0cd09023da95890f87c0c8a72 @@ -44,7 +44,7 @@ pkgbase = linux-rt sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 - sha256sums = 3e955e0f1aae96bb6c1507236adc952640c9bd0a134b9995ab92106a33dc02d9 + sha256sums = ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8 pkgname = linux-rt pkgdesc = The Linux-rt kernel and modules diff --git a/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch b/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch new file mode 100644 index 000000000000..25bd67970533 --- /dev/null +++ b/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch @@ -0,0 +1,46 @@ +From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov <andreyknvl@google.com> +Date: Thu, 16 Feb 2017 17:22:46 +0100 +Subject: [PATCH] dccp: fix freeing skb too early for IPV6_RECVPKTINFO + +In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet +is forcibly freed via __kfree_skb in dccp_rcv_state_process if +dccp_v6_conn_request successfully returns. + +However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb +is saved to ireq->pktopts and the ref count for skb is incremented in +dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed +in dccp_rcv_state_process. + +Fix by calling consume_skb instead of doing goto discard and therefore +calling __kfree_skb. + +Similar fixes for TCP: + +fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed. +0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now +simply consumed + +Signed-off-by: Andrey Konovalov <andreyknvl@google.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/dccp/input.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/dccp/input.c b/net/dccp/input.c +index ba347184bda9b3fe..8fedc2d497709b3d 100644 +--- a/net/dccp/input.c ++++ b/net/dccp/input.c +@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, + if (inet_csk(sk)->icsk_af_ops->conn_request(sk, + skb) < 0) + return 1; +- goto discard; ++ consume_skb(skb); ++ return 0; + } + if (dh->dccph_type == DCCP_PKT_RESET) + goto discard; +-- +2.11.1 diff --git a/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch b/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch deleted file mode 100644 index 8cef8463520f..000000000000 --- a/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 885bad1e5f32bbf30787ead9578f8174047e6904 Mon Sep 17 00:00:00 2001 -From: Yu-cheng Yu <yu-cheng.yu@intel.com> -Date: Thu, 17 Nov 2016 09:11:35 -0800 -Subject: [PATCH] x86/fpu: Fix invalid FPU ptrace state after execve() - -commit b22cbe404a9cc3c7949e380fa1861e31934c8978 upstream. - -Robert O'Callahan reported that after an execve PTRACE_GETREGSET -NT_X86_XSTATE continues to return the pre-exec register values -until the exec'ed task modifies FPU state. - -The test code is at: - - https://bugzilla.redhat.com/attachment.cgi?id=1164286. - -What is happening is fpu__clear() does not properly clear fpstate. -Fix it by doing just that. - -Reported-by: Robert O'Callahan <robert@ocallahan.org> -Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Borislav Petkov <bp@suse.de> -Cc: David Hansen <dave.hansen@linux.intel.com> -Cc: Fenghua Yu <fenghua.yu@intel.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Ravi V. Shankar <ravi.v.shankar@intel.com> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/1479402695-6553-1-git-send-email-yu-cheng.yu@intel.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/kernel/fpu/core.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c -index 3fc03a09a93b1710..c289e2f4a6e5b464 100644 ---- a/arch/x86/kernel/fpu/core.c -+++ b/arch/x86/kernel/fpu/core.c -@@ -517,14 +517,14 @@ void fpu__clear(struct fpu *fpu) - { - WARN_ON_FPU(fpu != ¤t->thread.fpu); /* Almost certainly an anomaly */ - -- if (!use_eager_fpu() || !static_cpu_has(X86_FEATURE_FPU)) { -- /* FPU state will be reallocated lazily at the first use. */ -- fpu__drop(fpu); -- } else { -- if (!fpu->fpstate_active) { -- fpu__activate_curr(fpu); -- user_fpu_begin(); -- } -+ fpu__drop(fpu); -+ -+ /* -+ * Make sure fpstate is cleared and initialized. -+ */ -+ if (static_cpu_has(X86_FEATURE_FPU)) { -+ fpu__activate_curr(fpu); -+ user_fpu_begin(); - copy_init_fpstate_to_fpregs(); - } - } --- -2.10.2 - @@ -8,8 +8,8 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-rt # Build kernel with a different name _srcname=linux-4.9 -_pkgver=4.9.9 -_rtpatchver=rt6 +_pkgver=4.9.11 +_rtpatchver=rt9 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -31,14 +31,14 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "${pkgbase}.preset" 'change-default-console-loglevel.patch' 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' - '0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch' + '0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch' ) sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a' 'SKIP' - 'ec97e3bf8585865d409a804316b276a6b4e4939286de9757f99bfb41cf112078' + '23e773a670f3cac11a92c4e442405dea6d2c28fea0f914ea2ba4bea313c26541' 'SKIP' - '405eb3b607e3e483732fcb4f7cca5330e7ace8a0c0b1db238536a77401d52ae6' + '6d408b02b7a937ee0d20021d997320c34fa0d181ba806ddafda96b58e974b804' 'SKIP' '88f1d3dc3e1570a4f0aae3733b5c4b666c68462c3a03550133762e5d22457fd9' 'fdc33cb2d09a9192046656285262fbca2bcab0b0cd09023da95890f87c0c8a72' @@ -46,7 +46,7 @@ sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' - '3e955e0f1aae96bb6c1507236adc952640c9bd0a134b9995ab92106a33dc02d9') + 'ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -68,11 +68,9 @@ prepare() { msg "applying patch-${_pkgver}-${_rtpatchver}.patch" patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch" - # Revert a commit that causes memory corruption in i686 chroots on our - # build server ("valgrind bash" immediately crashes) - # https://bugzilla.kernel.org/show_bug.cgi?id=190061 - msg "reverting 0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch" - patch -Rp1 -i "${srcdir}/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch" + # # https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6074 + msg "applying 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch" + patch -p1 -i "${srcdir}/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -87,7 +85,7 @@ prepare() { # Stops X from hanging on certain NVIDIA cards msg "fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch" patch -p1 -i "${srcdir}/fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch" - + msg "All patches have successfully been applied" if [ "${CARCH}" = "x86_64" ]; then |