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

Commit dafc741c authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nfctnetlink: assign helper to newly created conntrack 



This fixes the bug which doesn't assign helper to newly created
conntrack via nf_conntrack_netlink.

Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 691ce26e

net/netfilter/nf_conntrack_netlink.c

+8 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], 
{

	struct nf_conn *ct;

	int err = -EINVAL;

	struct nf_conn_help *help;



	ct = nf_conntrack_alloc(otuple, rtuple);

	if (ct == NULL || IS_ERR(ct))
@@ -976,9 +977,16 @@ ctnetlink_create_conntrack(struct nfattr *cda[], 
		ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));

#endif



	help = nfct_help(ct);

	if (help)

		help->helper = nf_ct_helper_find_get(rtuple);



	add_timer(&ct->timeout);

	nf_conntrack_hash_insert(ct);



	if (help && help->helper)

		nf_ct_helper_put(help->helper);



	return 0;



err: