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

Commit 7c3d5ab1 authored by Vasily Averin's avatar Vasily Averin Committed by Pablo Neira Ayuso
Browse files

ipv4: fix "conntrack zones" support for defrag user check in ip_expire 



Defrag user check in ip_expire was not updated after adding support for
"conntrack zones".

This bug manifests as a RFC violation, since the router will send
the icmp time exceeeded message when using conntrack zones.

Signed-off-by: default avatarVasily Averin <vvs@openvz.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ecd15dd7

net/ipv4/ip_fragment.c

+3 −2
Original line number Diff line number Diff line
@@ -232,8 +232,9 @@ static void ip_expire(unsigned long arg) 
		 * "Fragment Reassembly Timeout" message, per RFC792.

		 */

		if (qp->user == IP_DEFRAG_AF_PACKET ||

		    (qp->user == IP_DEFRAG_CONNTRACK_IN &&

		     skb_rtable(head)->rt_type != RTN_LOCAL))

		    ((qp->user >= IP_DEFRAG_CONNTRACK_IN) &&

		     (qp->user <= __IP_DEFRAG_CONNTRACK_IN_END) &&

		     (skb_rtable(head)->rt_type != RTN_LOCAL)))

			goto out_rcu_unlock;