From e9806d21282d3d5486b99b5c7062b490b00d8323 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <pierre@freebsdfoundation.org>
Date: Thu, 16 May 2024 18:55:54 +0200
Subject: [PATCH] bhyve: avoid resource leak in error path

In e820_finalize(), the e820_fwcfg_item variable, containing the
etc/e820 file (for the e820 table from the BIOS) is not free()'d when it
could not be added to the QEMU firmware configuration device (fw_cfg).

Reported by:	Coverity Scan
CID:		1522761
Reviewed by:	corvink, jhb
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45223
---
 usr.sbin/bhyve/amd64/e820.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr.sbin/bhyve/amd64/e820.c b/usr.sbin/bhyve/amd64/e820.c
index 456ce0330b5..9d95ec8ce68 100644
--- a/usr.sbin/bhyve/amd64/e820.c
+++ b/usr.sbin/bhyve/amd64/e820.c
@@ -483,6 +483,8 @@ e820_finalize(void)
 	    e820_fwcfg_item->size, e820_fwcfg_item->data);
 	if (error != 0) {
 		warnx("could not add qemu fwcfg etc/e820");
+		free(e820_fwcfg_item->data);
+		free(e820_fwcfg_item);
 		return (error);
 	}
 	free(e820_fwcfg_item);