From 6580ac8c81b839cadca0a0c910f4e1a046cb7b20 Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Sat, 18 Mar 2017 20:21:53 +0100 Subject: bump to 4.4.53_rt66-1 --- .SRCINFO | 18 ++++----- ...reeing-skb-too-early-for-IPV6_RECVPKTINFO.patch | 46 ---------------------- PKGBUILD | 15 +++---- 3 files changed, 13 insertions(+), 66 deletions(-) delete mode 100644 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch diff --git a/.SRCINFO b/.SRCINFO index d346841..65742e6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ # Generated by makepkg 5.0.1 -# Sun Mar 12 13:26:40 UTC 2017 +# Fri Mar 17 23:53:11 UTC 2017 pkgbase = linux-rt-lts - pkgver = 4.4.50_rt63 + pkgver = 4.4.53_rt66 pkgrel = 1 url = https://www.kernel.org/ arch = i686 @@ -15,17 +15,16 @@ pkgbase = linux-rt-lts options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.50.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.50.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.50-rt63.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.50-rt63.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.53.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.53.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.53-rt66.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.53-rt66.patch.sign source = config source = config.x86_64 source = 99-linux.hook source = linux-rt-lts.preset source = change-default-console-loglevel.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch - source = 0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -33,9 +32,9 @@ pkgbase = linux-rt-lts validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 sha256sums = SKIP - sha256sums = c5756a4b7290092d875967c310b684dbd91cb57438a25a3603bce6b1d0f19b36 + sha256sums = 51e09e851c00f42e04f27a1848a06e93e9de9abd22da0408da4745b6d2edbbdb sha256sums = SKIP - sha256sums = f6f5af2f790cdbe16bb5d1dc59521f3c01e235c9107dd180a3b0d38dfbc7a19a + sha256sums = 5ae37454239a187f5abb3cdf375f7bd143478a31744ee17636ca42131ea74748 sha256sums = SKIP sha256sums = 1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191 sha256sums = b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3 @@ -43,7 +42,6 @@ pkgbase = linux-rt-lts sha256sums = a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 - sha256sums = ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8 pkgname = linux-rt-lts pkgdesc = The Linux-rt-lts 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 deleted file mode 100644 index 25bd679..0000000 --- a/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 -From: Andrey Konovalov -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 -Acked-by: Eric Dumazet -Signed-off-by: David S. Miller ---- - 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/PKGBUILD b/PKGBUILD index b5995bf..df7b1ae 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,8 +7,8 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-rt-lts # Build kernel with a different name _srcname=linux-4.4 -_pkgver=4.4.50 -_rtpatchver=rt63 +_pkgver=4.4.53 +_rtpatchver=rt66 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -30,22 +30,20 @@ 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-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch' ) sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - 'c5756a4b7290092d875967c310b684dbd91cb57438a25a3603bce6b1d0f19b36' + '51e09e851c00f42e04f27a1848a06e93e9de9abd22da0408da4745b6d2edbbdb' 'SKIP' - 'f6f5af2f790cdbe16bb5d1dc59521f3c01e235c9107dd180a3b0d38dfbc7a19a' + '5ae37454239a187f5abb3cdf375f7bd143478a31744ee17636ca42131ea74748' 'SKIP' '1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191' 'b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' 'a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' - 'ab22d941388440ee7da44535305f535cb5a2abc4151289757f5753b13ebd78e8') + '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -79,9 +77,6 @@ prepare() { 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 "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" - msg "All patches have successfully been applied" if [ "${CARCH}" = "x86_64" ]; then -- cgit v1.2.3