[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241114175600.18882-1-jdamato@fastly.com>
Date: Thu, 14 Nov 2024 17:55:59 +0000
From: Joe Damato <jdamato@...tly.com>
To: netdev@...r.kernel.org
Cc: pabeni@...hat.com,
edumazet@...gle.com,
amritha.nambiar@...el.com,
sridhar.samudrala@...el.com,
kuba@...nel.org,
mkarsten@...terloo.ca,
Joe Damato <jdamato@...tly.com>,
"David S. Miller" <davem@...emloft.net>,
Simon Horman <horms@...nel.org>,
Mina Almasry <almasrymina@...gle.com>,
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH net-next v3] netdev-genl: Hold rcu_read_lock in napi_set
Hold rcu_read_lock during netdev_nl_napi_set_doit, which calls
napi_by_id and requires rcu_read_lock to be held.
Closes: https://lore.kernel.org/netdev/719083c2-e277-447b-b6ea-ca3acb293a03@redhat.com/
Fixes: 1287c1ae0fc2 ("netdev-genl: Support setting per-NAPI config values")
Signed-off-by: Joe Damato <jdamato@...tly.com>
---
v3:
- Separate the patches that were a series in v2 (and earlier) as
they target different trees.
v2:
- Simplified by adding rcu_read_lock/unlock instead of using the
helper proposed in the RFC.
net/core/netdev-genl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index 765ce7c9d73b..fa119ff68698 100644
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -346,6 +346,7 @@ int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)
napi_id = nla_get_u32(info->attrs[NETDEV_A_NAPI_ID]);
rtnl_lock();
+ rcu_read_lock();
napi = napi_by_id(napi_id);
if (napi) {
@@ -355,6 +356,7 @@ int netdev_nl_napi_set_doit(struct sk_buff *skb, struct genl_info *info)
err = -ENOENT;
}
+ rcu_read_unlock();
rtnl_unlock();
return err;
base-commit: 3d12862b216d39670500f6bd44b8be312b2ee4fb
--
2.25.1
Powered by blists - more mailing lists