summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchspa Shi <schspa@gmail.com>2022-06-29 10:29:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-25 11:15:45 +0200
commitfe72beac06f59c04dfd26f78aa72788cdd770ad0 (patch)
tree26b5646f8770dceeefa57a3358d52ff80a22ea91
parent59bc4c19d53bdac61ec952c01c6e864f5f0f8367 (diff)
downloadlinux-stable-fe72beac06f59c04dfd26f78aa72788cdd770ad0.tar.gz
linux-stable-fe72beac06f59c04dfd26f78aa72788cdd770ad0.tar.bz2
linux-stable-fe72beac06f59c04dfd26f78aa72788cdd770ad0.zip
vfio: Clear the caps->buf to NULL after free
[ Upstream commit 6641085e8d7b3f061911517f79a2a15a0a21b97b ] On buffer resize failure, vfio_info_cap_add() will free the buffer, report zero for the size, and return -ENOMEM. As additional hardening, also clear the buffer pointer to prevent any chance of a double free. Signed-off-by: Schspa Shi <schspa@gmail.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Link: https://lore.kernel.org/r/20220629022948.55608-1-schspa@gmail.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/vfio/vfio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 7a386fb30bf1..0d146b45e0b4 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -1808,6 +1808,7 @@ struct vfio_info_cap_header *vfio_info_cap_add(struct vfio_info_cap *caps,
buf = krealloc(caps->buf, caps->size + size, GFP_KERNEL);
if (!buf) {
kfree(caps->buf);
+ caps->buf = NULL;
caps->size = 0;
return ERR_PTR(-ENOMEM);
}