FAILED: patch "[PATCH] netdev: prevent accessing NAPI instances from another" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x d1cacd74776895f6435941f86a1130e58f6dd226
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025011253-citable-monstrous-3ae9@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d1cacd74776895f6435941f86a1130e58f6dd226 Mon Sep 17 00:00:00 2001
From: Jakub Kicinski <[email protected]>
Date: Mon, 6 Jan 2025 10:01:36 -0800
Subject: [PATCH] netdev: prevent accessing NAPI instances from another
namespace
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().
net/core/dev.c +30 -13
@@ -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 */ +struct napi_struct *netdev_napi_by_id (struct net *net,unsigned int napi_id) +{ +struct napi_struct *napi; + + napi =napi_by_id (napi_id); +if (!napi) +return NULL ; + +if (WARN_ON_ONCE (!napi->dev)) +return NULL ; +if (!net_eq (net,dev_net (napi->dev))) +return NULL ; + +return napi; +} +/** * __dev_get_by_name - find a device by its name * @net: the applicable net namespace
@@ -6293,19 +6323,6 @@ bool napi_complete_done(struct napi_struct *n, int work_done) }EXPORT_SYMBOL (napi_complete_done); -/* must be called under rcu_read_lock(), as we dont take a reference */ -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 ; -} -static void skb_defer_free_flush (struct softnet_data *sd) {struct sk_buff *skb, *next;
net/core/dev.h +2 -1
@@ -22,6 +22,8 @@ struct sd_flow_limit {extern int netdev_flow_limit_table_len; +struct napi_struct *netdev_napi_by_id (struct net *net,unsigned int napi_id); +#ifdef CONFIG_PROC_FS int __init dev_proc_init (void );#else
@@ -269,7 +271,6 @@ void xdp_do_check_flushed(struct napi_struct *napi);static inline void xdp_do_check_flushed (struct napi_struct *napi) { }#endif -struct napi_struct *napi_by_id (unsigned int napi_id);void kick_defer_list_purge (struct softnet_data *sd,unsigned int cpu);#define XMIT_RECURSION_LIMIT 8
net/core/netdev-genl.c +2 -4
@@ -167,8 +167,6 @@ netdev_nl_napi_fill_one(struct sk_buff *rsp, struct napi_struct *napi,void *hdr;pid_t pid; -if (WARN_ON_ONCE (!napi->dev)) -return -EINVAL ;if (!(napi->dev->flags &IFF_UP ))return 0 ;
@@ -234,7 +232,7 @@ int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info)rtnl_lock ();rcu_read_lock (); - napi =napi_by_id (napi_id); + napi =netdev_napi_by_id (genl_info_net (info), napi_id);if (napi) { err =netdev_nl_napi_fill_one (rsp, napi, info); }else {
@@ -355,7 +353,7 @@ int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)rtnl_lock ();rcu_read_lock (); - napi =napi_by_id (napi_id); + napi =netdev_napi_by_id (genl_info_net (info), napi_id);if (napi) { err =netdev_nl_napi_set_config (napi, info); }else {
Jakub Kicinski
maintainerPATCH 1/1 netdev: prevent accessing NAPI instances from another namespace
[ Upstream commit d1cacd74776895f6435941f86a1130e58f6dd226 ]
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().
--- net/core/dev.c | 43 +++++++++++++++++++++++++++++------------- net/core/dev.h | 3 ++- net/core/netdev-genl.c | 4 +--- 3 files changed, 33 insertions(+), 17 deletions(-)
net/core/dev.c +30 -13
@@ -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 */ +struct napi_struct *netdev_napi_by_id (struct net *net,unsigned int napi_id) +{ +struct napi_struct *napi; + + napi =napi_by_id (napi_id); +if (!napi) +return NULL ; + +if (WARN_ON_ONCE (!napi->dev)) +return NULL ; +if (!net_eq (net,dev_net (napi->dev))) +return NULL ; + +return napi; +} +/** * __dev_get_by_name - find a device by its name * @net: the applicable net namespace
@@ -6291,19 +6321,6 @@ bool napi_complete_done(struct napi_struct *n, int work_done) }EXPORT_SYMBOL (napi_complete_done); -/* must be called under rcu_read_lock(), as we dont take a reference */ -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 ; -} -static void skb_defer_free_flush (struct softnet_data *sd) {struct sk_buff *skb, *next;
net/core/dev.h +2 -1
@@ -22,6 +22,8 @@ struct sd_flow_limit {extern int netdev_flow_limit_table_len; +struct napi_struct *netdev_napi_by_id (struct net *net,unsigned int napi_id); +#ifdef CONFIG_PROC_FS int __init dev_proc_init (void );#else
@@ -146,7 +148,6 @@ void xdp_do_check_flushed(struct napi_struct *napi);static inline void xdp_do_check_flushed (struct napi_struct *napi) { }#endif -struct napi_struct *napi_by_id (unsigned int napi_id);void kick_defer_list_purge (struct softnet_data *sd,unsigned int cpu);#define XMIT_RECURSION_LIMIT 8
net/core/netdev-genl.c +1 -3
@@ -164,8 +164,6 @@ netdev_nl_napi_fill_one(struct sk_buff *rsp, struct napi_struct *napi,void *hdr;pid_t pid; -if (WARN_ON_ONCE (!napi->dev)) -return -EINVAL ;if (!(napi->dev->flags &IFF_UP ))return 0 ;
@@ -217,7 +215,7 @@ int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info)rtnl_lock ();rcu_read_lock (); - napi =napi_by_id (napi_id); + napi =netdev_napi_by_id (genl_info_net (info), napi_id);if (napi) { err =netdev_nl_napi_fill_one (rsp, napi, info); }else {
Signature · 1 line
2.47.1
Sasha Levin
maintainerRe: [PATCH 6.12.y] netdev: prevent accessing NAPI instances from another namespace
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: d1cacd74776895f6435941f86a1130e58f6dd226
Status in newer kernel trees:
6.12.y | Not found
Note: The patch differs from the upstream commit:
---
1: d1cacd747768 ! 1: 0686eb4ff47a netdev: prevent accessing NAPI instances from another namespace
@@ Metadata
## Commit message ##
netdev: prevent accessing NAPI instances from another namespace
+ [ Upstream commit d1cacd74776895f6435941f86a1130e58f6dd226 ]
+
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
@@ net/core/netdev-genl.c: int netdev_nl_napi_get_doit(struct sk_buff *skb, struct
if (napi) {
err = netdev_nl_napi_fill_one(rsp, napi, info);
} else {
-@@ net/core/netdev-genl.c: int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)
- rtnl_lock();
- rcu_read_lock();
-
-- napi = napi_by_id(napi_id);
-+ napi = netdev_napi_by_id(genl_info_net(info), napi_id);
- if (napi) {
- err = netdev_nl_napi_set_config(napi, info);
- } else {
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.12.y | Success | Success |