tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
netfilter: nf_ct_dccp/udplite: fix protocol registration error
Commit d0dba725 (netfilter: ctnetlink: add callbacks to the per-proto
nlattrs) changed the protocol registration function to abort if the
to-be registered protocol doesn't provide a new callback function.
The DCCP and UDP-Lite IPv6 protocols were missed in this conversion,
add the required callback pointer.
Reported-and-tested-by: Steven Jan Springl <steven@springl.ukfsn.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
+2
+1
net/netfilter/nf_conntrack_proto_dccp.c
+1
net/netfilter/nf_conntrack_proto_dccp.c
···
777
777
.print_conntrack = dccp_print_conntrack,
778
778
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
779
779
.to_nlattr = dccp_to_nlattr,
780
+
.nlattr_size = dccp_nlattr_size,
780
781
.from_nlattr = nlattr_to_dccp,
781
782
.tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
782
783
.nlattr_tuple_size = nf_ct_port_nlattr_tuple_size,
+1
net/netfilter/nf_conntrack_proto_udplite.c
+1
net/netfilter/nf_conntrack_proto_udplite.c
···
204
204
.error = udplite_error,
205
205
#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
206
206
.tuple_to_nlattr = nf_ct_port_tuple_to_nlattr,
207
+
.nlattr_tuple_size = nf_ct_port_nlattr_tuple_size,
207
208
.nlattr_to_tuple = nf_ct_port_nlattr_to_tuple,
208
209
.nla_policy = nf_ct_port_nla_policy,
209
210
#endif