lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 23/71] netfilter: synproxy: Fix out of bounds when parsing TCP options
    Date
    From: Maxim Mikityanskiy <maximmi@nvidia.com>

    [ Upstream commit 5fc177ab759418c9537433e63301096e733fb915 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nf_synproxy_core.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
    index c8a4a48bced9..8be604eb6961 100644
    --- a/net/netfilter/nf_synproxy_core.c
    +++ b/net/netfilter/nf_synproxy_core.c
    @@ -34,6 +34,9 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
    int length = (th->doff * 4) - sizeof(*th);
    u8 buf[40], *ptr;

    + if (unlikely(length < 0))
    + return false;
    +
    ptr = skb_header_pointer(skb, doff + sizeof(*th), length, buf);
    if (ptr == NULL)
    return false;
    @@ -50,6 +53,8 @@ synproxy_parse_options(const struct sk_buff *skb, unsigned int doff,
    length--;
    continue;
    default:
    + if (length < 2)
    + return true;
    opsize = *ptr++;
    if (opsize < 2)
    return true;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 17:40    [W:2.783 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site