netfilter: conntrack: unregister ipv4 sockopts on error unwind

Florian Westphal · ummakynes · commit 22cbdbcfb61a · 2021-05-20T00:01:11.000+02:00
When ipv6 sockopt register fails, the ipv4 one needs to be removed. Fixes: a0ae256 ("netfilter: conntrack: remove l3proto abstraction") Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git 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_getorigdst6);
+	nf_unregister_sockopt(&so_getorigdst);
 #endif
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ int nf_conntrack_proto_init(void)`
`664`	`664`
`665`	`665`	`#if IS_ENABLED(CONFIG_IPV6)`
`666`	`666`	`cleanup_sockopt:`
`667`		`- nf_unregister_sockopt(&so_getorigdst6);`
	`667`	`+ nf_unregister_sockopt(&so_getorigdst);`
`668`	`668`	`#endif`
`669`	`669`	`return ret;`
`670`	`670`	`}`