]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netdev-genl: Hold rcu_read_lock in napi_get
authorJoe Damato <jdamato@fastly.com>
Thu, 14 Nov 2024 17:51:56 +0000 (17:51 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:54:22 +0000 (13:54 +0100)
commit c53bf100f68619acf6cedcf4cf5249a1ca2db0b4 upstream.

Hold rcu_read_lock in netdev_nl_napi_get_doit, which calls napi_by_id
and is required to be called under rcu_read_lock.

Cc: stable@vger.kernel.org
Fixes: 27f91aaf49b3 ("netdev-genl: Add netlink framework functions for napi")
Signed-off-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20241114175157.16604-1-jdamato@fastly.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/netdev-genl.c

index a17d7eaeb00192498a5e14e6d4565ca1f6355b9d..f8f8c1e50ae4eb6f6fdefed1c26cea2f2bcfcff9 100644 (file)
@@ -214,6 +214,7 @@ int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info)
                return -ENOMEM;
 
        rtnl_lock();
+       rcu_read_lock();
 
        napi = napi_by_id(napi_id);
        if (napi) {
@@ -223,6 +224,7 @@ int netdev_nl_napi_get_doit(struct sk_buff *skb, struct genl_info *info)
                err = -ENOENT;
        }
 
+       rcu_read_unlock();
        rtnl_unlock();
 
        if (err)