diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-11-29 23:07:58 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 10:31:58 -0800 |
| commit | 8f5fb1bc5b1f50388ab0c4ec3c636faec0a9fe7e (patch) | |
| tree | 62728f91bdc7112da338b125731b6e3fe29fab01 | |
| parent | 7be57dece6dbe2b8b1b4e961f95e58e86680fa4d (diff) | |
| download | linux-stable-8f5fb1bc5b1f50388ab0c4ec3c636faec0a9fe7e.tar.gz linux-stable-8f5fb1bc5b1f50388ab0c4ec3c636faec0a9fe7e.tar.bz2 linux-stable-8f5fb1bc5b1f50388ab0c4ec3c636faec0a9fe7e.zip | |
TCP: MTUprobe: fix potential sk_send_head corruption
[TCP] MTUprobe: fix potential sk_send_head corruption
[ Upstream commit: 6e42141009ff18297fe19d19296738b742f861db ]
When the abstraction functions got added, conversion here was
made incorrectly. As a result, the skb may end up pointing
to skb which got included to the probe skb and then was freed.
For it to trigger, however, skb_transmit must fail sending as
well.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | include/net/tcp.h | 3 | ||||
| -rw-r--r-- | net/ipv4/tcp_output.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a99b4f6fb2cb..c05e01829950 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1258,6 +1258,9 @@ static inline void tcp_insert_write_queue_before(struct sk_buff *new, struct sock *sk) { __skb_insert(new, skb->prev, skb, &sk->sk_write_queue); + + if (sk->sk_send_head == skb) + sk->sk_send_head = new; } static inline void tcp_unlink_write_queue(struct sk_buff *skb, struct sock *sk) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 53232dd6fb48..eee57e647f51 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1279,7 +1279,6 @@ static int tcp_mtu_probe(struct sock *sk) skb = tcp_send_head(sk); tcp_insert_write_queue_before(nskb, skb, sk); - tcp_advance_send_head(sk, skb); TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq; TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size; |