]> git.baikalelectronics.ru Git - kernel.git/commit
sch_cake: Fix out of bounds when parsing TCP options and header
authorMaxim Mikityanskiy <maximmi@nvidia.com>
Thu, 10 Jun 2021 16:40:31 +0000 (19:40 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jun 2021 21:26:18 +0000 (14:26 -0700)
commit88a682a5fc4bb52a9421ea722241cb56bcc4aac4
tree747752d7c9d0866bd600032a7e6fcadf4b403215
parent412096b75ab81224fa896e74179dc74b2cba6e28
sch_cake: Fix out of bounds when parsing TCP options and header

The TCP option parser in cake qdisc (cake_get_tcpopt and
cake_tcph_may_drop) could read one byte out of bounds. When the length
is 1, the execution flow gets into the loop, reads one byte of the
opcode, and if the opcode is neither TCPOPT_EOL nor TCPOPT_NOP, it reads
one more byte, which exceeds the length of 1.

This fix is inspired by commit fae93b8ae922 ("ipv4: tcp_input: fix stack
out of bounds when parsing TCP options.").

v2 changes:

Added doff validation in cake_get_tcphdr to avoid parsing garbage as TCP
header. Although it wasn't strictly an out-of-bounds access (memory was
allocated), garbage values could be read where CAKE expected the TCP
header if doff was smaller than 5.

Cc: Young Xiao <92siuyang@gmail.com>
Fixes: 4c62b1e35205 ("sch_cake: Add optional ACK filter")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_cake.c