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

Commit 02b04b54 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: netfilter: Updating conntract pointer NULL check"

parents 3094e58b d2a0adf3

net/netfilter/nf_conntrack_sip.c

+3 −3
Original line number Original line 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)

	if (dataoff >= skb->len)

		return NF_ACCEPT;

		return NF_ACCEPT;





	if (!ct)

		return NF_DROP;



	nf_ct_refresh(ct, skb, sip_timeout * HZ);

	nf_ct_refresh(ct, skb, sip_timeout * HZ);





	if (unlikely(skb_linearize(skb)))

	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;

	oldlen1 = skb->len - protoff;

	dataoff_orig = dataoff;

	dataoff_orig = dataoff;





	if (!ct)

		return NF_DROP;



	dir = CTINFO2DIR(ctinfo);

	dir = CTINFO2DIR(ctinfo);





sip_header_process:

sip_header_process: