Merge "net: netfilter: Updating conntract pointer NULL check" (02b04b54) · Commits · e / devices / android_kernel_xiaomi_markw

net/netfilter/nf_conntrack_sip.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1916,6 +1916,9 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,
		if (dataoff >= skb->len)
		return NF_ACCEPT;

		if (!ct)
		return NF_DROP;

		nf_ct_refresh(ct, skb, sip_timeout * HZ);

		if (unlikely(skb_linearize(skb)))
		@@ -1934,9 +1937,6 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff,
		oldlen1 = skb->len - protoff;
		dataoff_orig = dataoff;

		if (!ct)
		return NF_DROP;

		dir = CTINFO2DIR(ctinfo);

		sip_header_process: