summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorNavid Emamdoost <navid.emamdoost@gmail.com>2024-02-17 20:25:38 -0800
committerSasha Levin <sashal@kernel.org>2024-03-26 18:20:28 -0400
commit96436365e5d80d0106ea785a4f80a58e7c9edff8 (patch)
treecadfeb7056d247e9cba4a9aa7f2a1195f63c7dd1 /drivers/block
parent267a6af60863490b54658fc239b3e3be5a0b6f92 (diff)
downloadlinux-96436365e5d80d0106ea785a4f80a58e7c9edff8.tar.gz
linux-96436365e5d80d0106ea785a4f80a58e7c9edff8.tar.bz2
linux-96436365e5d80d0106ea785a4f80a58e7c9edff8.zip
nbd: null check for nla_nest_start
[ 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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nbd.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9a53165de4ce..5c4be8dda253 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -2408,6 +2408,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) {