Skip to contentSkip to conversation

vfio: Clear the caps->buf to NULL after free

PATCH Applied Schspa Shi 2 participants 2 messages Jun 29, 2022 – Jun 30, 2022

Subsystems (2)
lore
Share & tools
lore

Schspa Shi

author
#0 lore raw

PATCH v3 1/1 vfio: Clear the caps->buf to NULL after free

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.

Signature · 8 lines
Changelog:
v1 -> v2:
        - Remove incorrect double free report in commit message.
v2 -> v3:
        - Update commit comment as Alex advised.
---
 drivers/vfio/vfio.c | 1 +
 1 file changed, 1 insertion(+)
drivers/vfio/vfio.c +1 -0
index 61e71c1154be..a0fb93866f61 100644
@@ -1812,6 +1812,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);
 	}
Signature · 1 line
2.29.0
#1 lore raw
Quoted 7 lines · On Wed, 29 Jun 2022 10:29:48 +0800 Schspa Shi <[email protected]> wrote:

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.

Applied to vfio next branch for v5.20. Thanks,

Alex