From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>, davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
Jakub Kicinski <kuba@kernel.org>,
stable@vger.kernel.org, jdamato@fastly.com,
almasrymina@google.com, amritha.nambiar@intel.com,
sridhar.samudrala@intel.com
Subject: Re: [PATCH net] netdev: prevent accessing NAPI instances from another namespace
Date: Tue, 07 Jan 2025 08:10:36 -0500 [thread overview]
Message-ID: <677d27cc5d9b_25382b294fd@willemb.c.googlers.com.notmuch> (raw)
In-Reply-To: <20250106180137.1861472-1-kuba@kernel.org>
Jakub Kicinski wrote:
> The NAPI IDs were not fully exposed to user space prior to the netlink
> API, so they were never namespaced. The netlink API must ensure that
> at the very least NAPI instance belongs to the same netns as the owner
> of the genl sock.
>
> napi_by_id() can become static now, but it needs to move because of
> dev_get_by_napi_id().
>
> Cc: stable@vger.kernel.org
> Fixes: 1287c1ae0fc2 ("netdev-genl: Support setting per-NAPI config values")
> Fixes: 27f91aaf49b3 ("netdev-genl: Add netlink framework functions for napi")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> Splitting this into fix per-version is a bit tricky, because we need
> to replace the napi_by_id() helper with a better one. I'll send the
> stable versions manually.
>
> CC: jdamato@fastly.com
> CC: almasrymina@google.com
> CC: amritha.nambiar@intel.com
> CC: sridhar.samudrala@intel.com
> ---
> net/core/dev.c | 43 +++++++++++++++++++++++++++++-------------
> net/core/dev.h | 3 ++-
> net/core/netdev-genl.c | 6 ++----
> 3 files changed, 34 insertions(+), 18 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 7c63d97b13c1..e001df4cb486 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -753,6 +753,36 @@ int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
> }
> EXPORT_SYMBOL_GPL(dev_fill_forward_path);
>
> +/* must be called under rcu_read_lock(), as we dont take a reference */
> +static struct napi_struct *napi_by_id(unsigned int napi_id)
> +{
> + unsigned int hash = napi_id % HASH_SIZE(napi_hash);
> + struct napi_struct *napi;
> +
> + hlist_for_each_entry_rcu(napi, &napi_hash[hash], napi_hash_node)
> + if (napi->napi_id == napi_id)
> + return napi;
> +
> + return NULL;
> +}
> +
> +/* must be called under rcu_read_lock(), as we dont take a reference */
Instead of function comments, invariant checks in code?
Like in dev_get_by_napi_id:
WARN_ON_ONCE(!rcu_read_lock_held());
next prev parent reply other threads:[~2025-01-07 13:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 18:01 [PATCH net] netdev: prevent accessing NAPI instances from another namespace Jakub Kicinski
2025-01-07 5:30 ` Samudrala, Sridhar
2025-01-07 13:10 ` Willem de Bruijn [this message]
2025-01-07 16:36 ` Jakub Kicinski
2025-01-07 20:31 ` Willem de Bruijn
2025-01-08 17:24 ` Joe Damato
2025-01-08 19:20 ` patchwork-bot+netdevbpf
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=677d27cc5d9b_25382b294fd@willemb.c.googlers.com.notmuch \
--to=willemdebruijn.kernel@gmail.com \
--cc=almasrymina@google.com \
--cc=amritha.nambiar@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jdamato@fastly.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sridhar.samudrala@intel.com \
--cc=stable@vger.kernel.org \
/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