Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ff48294 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

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: default avatarSteven Jan Springl <steven@springl.ukfsn.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c197facc

net/netfilter/nf_conntrack_proto_dccp.c

+1 −0
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ static struct nf_conntrack_l4proto dccp_proto6 __read_mostly = { 
	.print_conntrack	= dccp_print_conntrack,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.to_nlattr		= dccp_to_nlattr,

	.nlattr_size		= dccp_nlattr_size,

	.from_nlattr		= nlattr_to_dccp,

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,

net/netfilter/nf_conntrack_proto_udplite.c

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly = 
	.error			= udplite_error,

#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,

	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,

	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,

	.nla_policy		= nf_ct_port_nla_policy,

#endif