summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-15 17:24:07 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-15 17:24:07 -0700
commit7aea5974a2d72bc7d406d3a9b002cf4519c892fb (patch)
tree98b063a7eb4b839cfbbe16d331b788c47762fc23
parent332f0a412a5b868f549029178bc113425347bb6b (diff)
parentd08034c126393859c9d4f4838c980b2a4ddd2c48 (diff)
downloadpi-v4.4-7aea5974a2d72bc7d406d3a9b002cf4519c892fb.tar.gz
Fix backport of "tcp: detect malicious patterns in tcp_collapse_ofo_queue()"
am: d08034c126 Change-Id: I8c40c3dab467fc2419fdcbea4537e5f8e1c935cd
-rw-r--r--net/ipv4/tcp_input.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2bf1110aa2ae..dcb0b0e9a84c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4811,6 +4811,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk)
/* Start new segment */
start = TCP_SKB_CB(skb)->seq;
end = TCP_SKB_CB(skb)->end_seq;
+ range_truesize = skb->truesize;
} else {
if (before(TCP_SKB_CB(skb)->seq, start))
start = TCP_SKB_CB(skb)->seq;