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

Commit 06dfd167 authored by Eric Dumazet's avatar Eric Dumazet Committed by Gerrit - the friendly Code Review server
Browse files

tcp: take care of truncations done by sk_filter() 



With syzkaller help, Marco Grassi found a bug in TCP stack,
crashing in tcp_collapse()

Root cause is that sk_filter() can truncate the incoming skb,
but TCP stack was not really expecting this to happen.
It probably was expecting a simple DROP or ACCEPT behavior.

We first need to make sure no part of TCP header could be removed.
Then we need to adjust TCP_SKB_CB(skb)->end_seq

Many thanks to syzkaller team and Marco for giving us a reproducer.

CRs-Fixed: 1089895
Change-Id: I84185558fa6e80b13d7d0078bda9d75143680941
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarMarco Grassi <marco.gra@gmail.com>
Reported-by: default avatarVladis Dronov <vdronov@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Git-commit: ac6e780070e30e4c35bd395acfe9191e6268bdd3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git


[subashab@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
parent 94638198

include/net/tcp.h

+1 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,7 @@ static inline void tcp_prequeue_init(struct tcp_sock *tp) 
}



bool tcp_prequeue(struct sock *sk, struct sk_buff *skb);

int tcp_filter(struct sock *sk, struct sk_buff *skb);



#undef STATE_TRACE

net/ipv4/tcp_ipv4.c

+18 −1
Original line number Diff line number Diff line
@@ -1581,6 +1581,21 @@ bool tcp_prequeue(struct sock *sk, struct sk_buff *skb) 
}

EXPORT_SYMBOL(tcp_prequeue);



int tcp_filter(struct sock *sk, struct sk_buff *skb)

{

	struct tcphdr *th = (struct tcphdr *)skb->data;

	unsigned int eaten = skb->len;

	int err;



	err = sk_filter_trim_cap(sk, skb, th->doff * 4);

	if (!err) {

		eaten -= skb->len;

		TCP_SKB_CB(skb)->end_seq -= eaten;

	}

	return err;

}

EXPORT_SYMBOL(tcp_filter);



/*

 *	From tcp_input.c

 */
@@ -1664,8 +1679,10 @@ process: 


	nf_reset(skb);



	if (sk_filter(sk, skb))

	if (tcp_filter(sk, skb))

		goto discard_and_relse;

	th = (const struct tcphdr *)skb->data;

	iph = ip_hdr(skb);



	sk_mark_napi_id(sk, skb);

	skb->dev = NULL;

net/ipv6/tcp_ipv6.c

+4 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	if (skb->protocol == htons(ETH_P_IP))

		return tcp_v4_do_rcv(sk, skb);



	if (sk_filter(sk, skb))

	if (tcp_filter(sk, skb))

		goto discard;



	/*
@@ -1460,8 +1460,10 @@ process: 
		goto discard_and_relse;

#endif



	if (sk_filter(sk, skb))

	if (tcp_filter(sk, skb))

		goto discard_and_relse;

	th = (const struct tcphdr *)skb->data;

	hdr = ipv6_hdr(skb);



	sk_mark_napi_id(sk, skb);

	skb->dev = NULL;