From: David Ahern <dsahern@kernel.org>
To: Dmitry Safonov <dima@arista.com>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Dmitry Safonov <0x7f454c46@gmail.com>,
Francesco Ruggeri <fruggeri05@gmail.com>,
Salam Noureddine <noureddine@arista.com>,
Simon Horman <horms@kernel.org>,
netdev@vger.kernel.org
Subject: Re: [PATCH v3 5/7] net/tcp: Don't add key with non-matching VRF on connected sockets
Date: Tue, 28 Nov 2023 18:34:51 -0700 [thread overview]
Message-ID: <eb9a46a5-d074-445a-9e18-514ef78395d7@kernel.org> (raw)
In-Reply-To: <20231128205749.312759-6-dima@arista.com>
On 11/28/23 1:57 PM, Dmitry Safonov wrote:
> If the connection was established, don't allow adding TCP-AO keys that
> don't match the peer. Currently, there are checks for ip-address
> matching, but L3 index check is missing. Add it to restrict userspace
you say L3 index check is missing - add it. yet ...
> shooting itself somewhere.
>
> Fixes: 248411b8cb89 ("net/tcp: Wire up l3index to TCP-AO")
> Signed-off-by: Dmitry Safonov <dima@arista.com>
> ---
> net/ipv4/tcp_ao.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
> index bf41be6d4721..2d000e275ce7 100644
> --- a/net/ipv4/tcp_ao.c
> +++ b/net/ipv4/tcp_ao.c
> @@ -1608,6 +1608,9 @@ static int tcp_ao_add_cmd(struct sock *sk, unsigned short int family,
> if (!dev || !l3index)
> return -EINVAL;
>
> + if (!((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)))
> + return -EINVAL;
... this is checking socket state.
> +
> /* It's still possible to bind after adding keys or even
> * re-bind to a different dev (with CAP_NET_RAW).
> * So, no reason to return error here, rather try to be
next prev parent reply other threads:[~2023-11-29 1:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 20:57 [PATCH v3 0/7] TCP-AO fixes Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 1/7] Documentation/tcp: Fix an obvious typo Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 2/7] net/tcp: Consistently align TCP-AO option in the header Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 3/7] net/tcp: Limit TCP_AO_REPAIR to non-listen sockets Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 4/7] net/tcp: Allow removing current/rnext TCP-AO keys on TCP_LISTEN sockets Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 5/7] net/tcp: Don't add key with non-matching VRF on connected sockets Dmitry Safonov
2023-11-29 1:34 ` David Ahern [this message]
2023-11-29 15:42 ` Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 6/7] net/tcp: Store SNEs + SEQs on ao_info Dmitry Safonov
2023-11-28 20:57 ` [PATCH v3 7/7] net/tcp: Don't store TCP-AO maclen on reqsk Dmitry Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb9a46a5-d074-445a-9e18-514ef78395d7@kernel.org \
--to=dsahern@kernel.org \
--cc=0x7f454c46@gmail.com \
--cc=davem@davemloft.net \
--cc=dima@arista.com \
--cc=edumazet@google.com \
--cc=fruggeri05@gmail.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=noureddine@arista.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).