]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netdev-genl: avoid empty messages in queue dump
authorJakub Kicinski <kuba@kernel.org>
Wed, 18 Dec 2024 02:25:08 +0000 (18:25 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Dec 2024 13:02:05 +0000 (14:02 +0100)
[ Upstream commit 5eb70dbebf32c2fd1f2814c654ae17fc47d6e859 ]

Empty netlink responses from do() are not correct (as opposed to
dump() where not dumping anything is perfectly fine).
We should return an error if the target object does not exist,
in this case if the netdev is down it has no queues.

Fixes: 6b6171db7fc8 ("netdev-genl: Add netlink framework functions for queue")
Reported-by: syzbot+0a884bc2d304ce4af70f@syzkaller.appspotmail.com
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20241218022508.815344-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/core/netdev-genl.c

index 224d1b5b79a7499ece77ee61bcb4c2d3eb14b294..7ce22f40db5b0452910938500276c34eef767b60 100644 (file)
@@ -359,10 +359,10 @@ static int
 netdev_nl_queue_fill(struct sk_buff *rsp, struct net_device *netdev, u32 q_idx,
                     u32 q_type, const struct genl_info *info)
 {
-       int err = 0;
+       int err;
 
        if (!(netdev->flags & IFF_UP))
-               return err;
+               return -ENOENT;
 
        err = netdev_nl_queue_validate(netdev, q_idx, q_type);
        if (err)