projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04c26fa
)
netfilter: conntrack: unregister ipv4 sockopts on error unwind
author
Florian Westphal
<fw@strlen.de>
Tue, 4 May 2021 14:40:00 +0000
(16:40 +0200)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 19 May 2021 22:01:11 +0000
(
00:01
+0200)
When ipv6 sockopt register fails, the ipv4 one needs to be removed.
Fixes:
a0ae2562c6c
("netfilter: conntrack: remove l3proto abstraction")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_proto.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_conntrack_proto.c
b/net/netfilter/nf_conntrack_proto.c
index
89e5bac
..
dc9ca12
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto.c
+++ b/
net/netfilter/nf_conntrack_proto.c
@@
-664,7
+664,7
@@
int nf_conntrack_proto_init(void)
#if IS_ENABLED(CONFIG_IPV6)
cleanup_sockopt:
- nf_unregister_sockopt(&so_getorigdst
6
);
+ nf_unregister_sockopt(&so_getorigdst);
#endif
return ret;
}