]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
vfio: Clear the caps->buf to NULL after free
authorSchspa Shi <schspa@gmail.com>
Wed, 29 Jun 2022 02:29:48 +0000 (10:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:38:18 +0000 (11:38 +0200)
[ 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>
drivers/vfio/vfio.c

index f886f2db8153e5425dc946cb599137a2f456537e..90db9d66867c7a5a995f904daef6f59e28f58bba 100644 (file)
@@ -1783,6 +1783,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);
        }