summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-04-18 10:14:23 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-18 16:52:45 -0400
commit22b4a4f22da4b39c6f7f679fd35f3d35c91bf851 (patch)
tree6cd9d5d169384e39c030e18f75c1b1e0d792e5bd /net/ipv4
parent56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47 (diff)
downloadlinux-22b4a4f22da4b39c6f7f679fd35f3d35c91bf851.tar.gz
linux-22b4a4f22da4b39c6f7f679fd35f3d35c91bf851.tar.bz2
linux-22b4a4f22da4b39c6f7f679fd35f3d35c91bf851.zip
tcp: fix retransmit of partially acked frames
Alexander Beregalov reported skb_over_panic errors and provided stack trace. I occurs commit a21d45726aca (tcp: avoid order-1 allocations on wifi and tx path) added a regression, when a retransmit is done after a partial ACK. tcp_retransmit_skb() tries to aggregate several frames if the first one has enough available room to hold the following ones payload. This is controlled by /proc/sys/net/ipv4/tcp_retrans_collapse tunable (default : enabled) Problem is we must make sure _pskb_trim_head() doesnt fool skb_availroom() when pulling some bytes from skb (this pull is done when receiver ACK part of the frame). Reported-by: Alexander Beregalov <a.beregalov@gmail.com> Cc: Marc MERLIN <marc@merlins.org> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_output.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 376b2cfbb685..7ac6423117ad 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1096,6 +1096,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len)
eat = min_t(int, len, skb_headlen(skb));
if (eat) {
__skb_pull(skb, eat);
+ skb->avail_size -= eat;
len -= eat;
if (!len)
return;