]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: synproxy: Fix out of bounds when parsing TCP options
authorMaxim Mikityanskiy <maximmi@nvidia.com>
Thu, 10 Jun 2021 16:40:29 +0000 (19:40 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jun 2021 21:26:18 +0000 (14:26 -0700)
commit5fc177ab759418c9537433e63301096e733fb915
tree37b7b80b5a8f0c2156bb51e9af0fd0be5fba0ea0
parentd1b5bee4c8be01585033be9b3a8878789285285f
netfilter: synproxy: Fix out of bounds when parsing TCP options

The TCP option parser in synproxy (synproxy_parse_options) 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 9609dad263f8 ("ipv4: tcp_input: fix stack
out of bounds when parsing TCP options.").

v2 changes:

Added an early return when length < 0 to avoid calling
skb_header_pointer with negative length.

Cc: Young Xiao <92siuyang@gmail.com>
Fixes: 48b1de4c110a ("netfilter: add SYNPROXY core/target")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_synproxy_core.c