diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2019-11-23 17:10:09 +0000 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2019-11-23 17:28:32 +0000 |
| commit | 1c5df850a07690451f2878a310c0ea67d0690836 (patch) | |
| tree | 24566ae22f72dbf3d17a16af162a0d0081bc564c /target/linux | |
| parent | 09c428ec6bca27bdb31e2f6fef85b07787cead30 (diff) | |
| download | upstream-1c5df850a07690451f2878a310c0ea67d0690836.tar.gz upstream-1c5df850a07690451f2878a310c0ea67d0690836.tar.bz2 upstream-1c5df850a07690451f2878a310c0ea67d0690836.zip | |
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 <yszhou4tech@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch | 12 | ||||
| -rw-r--r-- | target/linux/generic/backport-4.19/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 <fw@strlen.de> # 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 <fw@strlen.de> + 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 <fw@strlen.de> # 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 <fw@strlen.de> + 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); + } |