]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nbd: null check for nla_nest_start
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Sun, 18 Feb 2024 04:25:38 +0000 (20:25 -0800)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:47 +0000 (18:21 -0400)
[ Upstream commit 31edf4bbe0ba27fd03ac7d87eb2ee3d2a231af6d ]

nla_nest_start() may fail and return NULL. Insert a check and set errno
based on other call sites within the same source code.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Fixes: 47d902b90a32 ("nbd: add a status netlink command")
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20240218042534.it.206-kees@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/nbd.c

index e0f805ca0e72740465f254aa0a5f8195eec01176..d6e3edb40474823870b8ac71920226ef3748fdc0 100644 (file)
@@ -2339,6 +2339,12 @@ static int nbd_genl_status(struct sk_buff *skb, struct genl_info *info)
        }
 
        dev_list = nla_nest_start_noflag(reply, NBD_ATTR_DEVICE_LIST);
+       if (!dev_list) {
+               nlmsg_free(reply);
+               ret = -EMSGSIZE;
+               goto out;
+       }
+
        if (index == -1) {
                ret = idr_for_each(&nbd_index_idr, &status_cb, reply);
                if (ret) {