tcp: md5: fix potential overestimation of TCP option space
Subsystems (3)
PATCH 1/1 tcp: md5: fix potential overestimation of TCP option space
Back in 2008, Adam Langley fixed the corner case of packets for flows having all of the following options : MD5 TS SACK
Since MD5 needs 20 bytes, and TS needs 12 bytes, no sack block can be cooked from the remaining 8 bytes.
tcp_established_options() correctly sets opts->num_sack_blocks to zero, but returns 36 instead of 32.
This means TCP cooks packets with 4 extra bytes at the end of options, containing unitialized bytes.
--- net/ipv4/tcp_output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv4/tcp_output.c +3 -2
@@ -755,8 +755,9 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb min_t(unsigned int, eff_sacks, (remaining -TCPOLEN_SACK_BASE_ALIGNED ) / TCPOLEN_SACK_PERBLOCK); - size +=TCPOLEN_SACK_BASE_ALIGNED + - opts->num_sack_blocks *TCPOLEN_SACK_PERBLOCK ; +if (likely (opts->num_sack_blocks)) + size +=TCPOLEN_SACK_BASE_ALIGNED + + opts->num_sack_blocks *TCPOLEN_SACK_PERBLOCK ; }return size;
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Quoted 10 lines · Eric Dumazet
Back in 2008, Adam Langley fixed the corner case of packets for flows having all of the following options : MD5 TS SACK
Since MD5 needs 20 bytes, and TS needs 12 bytes, no sack block can be cooked from the remaining 8 bytes.
tcp_established_options()correctly setsopts->num_sack_blocksto zero, but returns 36 instead of 32.
Quoted 7 lines
This means TCP cooks packets with 4 extra bytes at the end of options, containing unitialized bytes.
Fixes 33ad798c924b ("tcp: options clean up")Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>---
Thanks, Eric!
neal
Soheil Hassas Yeganeh
Acked-byQuoted 15 lines · Neal Cardwell
Quoted 13 lines · Eric Dumazet
Back in 2008, Adam Langley fixed the corner case of packets for flows having all of the following options : MD5 TS SACK
Since MD5 needs 20 bytes, and TS needs 12 bytes, no sack block can be cooked from the remaining 8 bytes.
tcp_established_options()correctly setsopts->num_sack_blocksto zero, but returns 36 instead of 32.This means TCP cooks packets with 4 extra bytes at the end of options, containing unitialized bytes.
Quoted 6 lines
Quoted 4 lines
Fixes 33ad798c924b ("tcp: options clean up")Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>---
Acked-by Neal Cardwell <[email protected]>
Thanks for the fix!
Quoted 3 lines
Thanks, Eric!
neal
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Thu, 5 Dec 2019 10:10:15 -0800
Quoted 9 lines
Back in 2008, Adam Langley fixed the corner case of packets for flows having all of the following options : MD5 TS SACK
Since MD5 needs 20 bytes, and TS needs 12 bytes, no sack block can be cooked from the remaining 8 bytes.
tcp_established_options()correctly setsopts->num_sack_blocksto zero, but returns 36 instead of 32.
Quoted 6 lines
This means TCP cooks packets with 4 extra bytes at the end of options, containing unitialized bytes.
Fixes 33ad798c924b ("tcp: options clean up")Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>
Applied and queued up for -stable, thanks Eric.