From 1c5df850a07690451f2878a310c0ea67d0690836 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 23 Nov 2019 17:10:09 +0000 Subject: [PATCH 1/3] kernel: nf_conntrack_rtcache: fix WARNING on forward path Fixes b7c58a1ee ("kernel: nf_conntrack_rtcache: fix cleanup on netns delete and rmmod") Resolves FS#2624 Signed-off-by: Yousong Zhou --- .../020-backport_netfilter_rtcache.patch | 12 +----------- .../020-backport_netfilter_rtcache.patch | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch index d745a97026..37fd203d50 100644 --- a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch +++ b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch @@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal # netlink interface for nf_conntrack --- /dev/null +++ b/net/netfilter/nf_conntrack_rtcache.c -@@ -0,0 +1,440 @@ +@@ -0,0 +1,430 @@ +/* route cache for netfilter. + * + * (C) 2014 Red Hat GmbH @@ -475,18 +475,8 @@ Signed-off-by: Florian Westphal + return ret; + } + -+ ret = nf_register_net_hooks(&init_net, rtcache_ops, -+ ARRAY_SIZE(rtcache_ops)); -+ if (ret < 0) { -+ nf_ct_extend_unregister(&rtcache_extend); -+ unregister_pernet_subsys(&rtcache_ops_net_ops); -+ return ret; -+ } -+ + ret = register_netdevice_notifier(&nf_rtcache_notifier); + if (ret) { -+ nf_unregister_net_hooks(&init_net, rtcache_ops, -+ ARRAY_SIZE(rtcache_ops)); + nf_ct_extend_unregister(&rtcache_extend); + unregister_pernet_subsys(&rtcache_ops_net_ops); + } diff --git a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch index 2d84bc2acf..b4ea1bcacb 100644 --- a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch +++ b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch @@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal # netlink interface for nf_conntrack --- /dev/null +++ b/net/netfilter/nf_conntrack_rtcache.c -@@ -0,0 +1,440 @@ +@@ -0,0 +1,430 @@ +/* route cache for netfilter. + * + * (C) 2014 Red Hat GmbH @@ -475,18 +475,8 @@ Signed-off-by: Florian Westphal + return ret; + } + -+ ret = nf_register_net_hooks(&init_net, rtcache_ops, -+ ARRAY_SIZE(rtcache_ops)); -+ if (ret < 0) { -+ nf_ct_extend_unregister(&rtcache_extend); -+ unregister_pernet_subsys(&rtcache_ops_net_ops); -+ return ret; -+ } -+ + ret = register_netdevice_notifier(&nf_rtcache_notifier); + if (ret) { -+ nf_unregister_net_hooks(&init_net, rtcache_ops, -+ ARRAY_SIZE(rtcache_ops)); + nf_ct_extend_unregister(&rtcache_extend); + unregister_pernet_subsys(&rtcache_ops_net_ops); + } From b3779e920ebaa168eaf18ac1140774c32b6ec6b6 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 23 Nov 2019 18:05:45 +0000 Subject: [PATCH 2/3] kernel: nf_conntrack_rtcache: fix WARNING on rmmod Fixes b7c58a1ee ("kernel: nf_conntrack_rtcache: fix cleanup on netns delete and rmmod") Signed-off-by: Yousong Zhou --- .../backport-4.14/020-backport_netfilter_rtcache.patch | 4 +--- .../backport-4.19/020-backport_netfilter_rtcache.patch | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch index 37fd203d50..88e5386c1f 100644 --- a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch +++ b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch @@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal # netlink interface for nf_conntrack --- /dev/null +++ b/net/netfilter/nf_conntrack_rtcache.c -@@ -0,0 +1,430 @@ +@@ -0,0 +1,428 @@ +/* route cache for netfilter. + * + * (C) 2014 Red Hat GmbH @@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal + + unregister_netdevice_notifier(&nf_rtcache_notifier); + unregister_pernet_subsys(&rtcache_ops_net_ops); -+ for_each_net(net) -+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops)); + + synchronize_net(); + diff --git a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch index b4ea1bcacb..c02b8f39e0 100644 --- a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch +++ b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch @@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal # netlink interface for nf_conntrack --- /dev/null +++ b/net/netfilter/nf_conntrack_rtcache.c -@@ -0,0 +1,430 @@ +@@ -0,0 +1,428 @@ +/* route cache for netfilter. + * + * (C) 2014 Red Hat GmbH @@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal + + unregister_netdevice_notifier(&nf_rtcache_notifier); + unregister_pernet_subsys(&rtcache_ops_net_ops); -+ for_each_net(net) -+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops)); + + synchronize_net(); + From 68fb38548b1051f97879d771258b480c6b81a3da Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sat, 23 Nov 2019 21:25:13 +0100 Subject: [PATCH 3/3] nghttp2: bump to 1.40.0 41060943 Bump up version number to 1.40.0, LT revision to 33:0:19 5ae9bb89 Fail fast if huffman decoding context is in failure state bb519154 Merge pull request #1413 from nghttp2/check-authority 77f5487a Add nghttp2_check_authority as public API db9a8f6e Merge pull request #1409 from nghttp2/fix-wrong-stream-close-error-code 6f28a69b Merge pull request #1411 from richard78917/fix_warning 6ce4835e Fix the bug that stream is closed with wrong error code 29042f1c priority_spec::valid(): remove const qualifier from return value d08c4395 Merge pull request #1405 from nghttp2/huffman 5d6964cf Faster huffman decoding 0d855bfc Faster huffman encoding 6f967c6e Fix errors reported by coverity scan b8a43db8 Merge pull request #1394 from wrowe/fix-static-libname 70b62c1a Merge pull request #1393 from wrowe/fix-static-msvcrt 28b1f0b9 Avoid filename collision of static and dynamic lib 1dd966f1 Merge branch 'fix-nghttpx-mruby' fe8946dd nghttpx: Fix bug that mruby is incorrectly shared between backends 72b71a6b Add new flag ENABLE_STATIC_CRT for Windows f8933fe5 nghttpx: Reconnect h1 backend if it lost connection before sending headers 89c33d69 Update neverbleed 7079dc5e Update neverbleed to fix memory leak 5080db84 Revert "nghttpx: Reconnect h1 backend if it lost connection before sending headers" 053c7ac5 nghttpx: Returns 408 if backend timed out before sending headers 8a59ce6d nghttpx: Reconnect h1 backend if it lost connection before sending headers f2fde180 Remove redundant null check before delete 95efb3e1 Don't read too greedily 0a6ce87c Add nghttp2_option_set_max_outbound_ack 2aa79fa9 Bump up LT revision to 32:0:18 3980678d Merge branch 'nghttpx-fix-request-stall' 319d5ab1 nghttpx: Fix request stall 448bbbc3 integration-tests: gofmt e575a2aa Merge pull request #1377 from Aldrog/cmake_systemd 4f7aedc9 cmake: Support building nghttpx with systemd 7a590893 Fix clang-8 warning ee443134 Fix FPE with default backend abef9b90 Fix log-level is not set with cmd-line or configuration file 12a999f0 Bump up version number to 1.40.0-DEV acfb3607 Update manual pages Signed-off-by: Hans Dedecker --- package/libs/nghttp2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/nghttp2/Makefile b/package/libs/nghttp2/Makefile index 1d364c7023..99555a57db 100644 --- a/package/libs/nghttp2/Makefile +++ b/package/libs/nghttp2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nghttp2 -PKG_VERSION:=1.39.2 -PKG_RELEASE:=2 +PKG_VERSION:=1.40.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION) -PKG_HASH:=a2d216450abd2beaf4e200c168957968e89d602ca4119338b9d7ab059fd4ce8b +PKG_HASH:=09fc43d428ff237138733c737b29fb1a7e49d49de06d2edbed3bc4cdcee69073 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING