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

Commit 3206c516 authored by Harsha Sharma's avatar Harsha Sharma Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_ct: make l3 protocol field optional for timeout object 



If l3 protocol value is not specified for ct timeout object then use the
value from nft_ctx protocol family.

Signed-off-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1bfc2bc7

net/netfilter/nft_ct.c

+4 −3
Original line number Diff line number Diff line
@@ -832,12 +832,13 @@ static int nft_ct_timeout_obj_init(const struct nft_ctx *ctx, 
	__u8 l4num;

	int ret;



	if (!tb[NFTA_CT_TIMEOUT_L3PROTO] ||

	    !tb[NFTA_CT_TIMEOUT_L4PROTO] ||

	if (!tb[NFTA_CT_TIMEOUT_L4PROTO] ||

	    !tb[NFTA_CT_TIMEOUT_DATA])

		return -EINVAL;



	if (tb[NFTA_CT_TIMEOUT_L3PROTO])

		l3num = ntohs(nla_get_be16(tb[NFTA_CT_TIMEOUT_L3PROTO]));



	l4num = nla_get_u8(tb[NFTA_CT_TIMEOUT_L4PROTO]);

	priv->l4proto = l4num;