File fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.p... of Package ipmitool

Overview Repositories Revisions Requests Users Attributes Meta

File fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch of Package ipmitool

From: Chrostoper Ertl <chertl@microsoft.com>
Subject: fru: Fix buffer overflow in ipmi_spd_print_fru
References: bsc#1163026, CVE-2020-5208
Patch-Mainline: 
Git-commit: 840fb1cbb4fb365cb9797300e3374d4faefcdb10
Git-repo: https://github.com/ipmitool/ipmitool.git.git

Partial fix for CVE-2020-5208, see
https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp

The `ipmi_spd_print_fru` function has a similar issue as the one fixed
by the previous commit in `read_fru_area_section`. An initial request is
made to get the `fru.size`, which is used as the size for the allocation
of `spd_data`. Inside a loop, further requests are performed to get the
copy sizes which are not checked before being used as the size for a
copy into the buffer.

Signed-off-by:  <trenn@suse.com>
---
 lib/dimm_spd.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- a/lib/dimm_spd.c
+++ b/lib/dimm_spd.c
@@ -1621,7 +1621,7 @@
 	struct ipmi_rq req;
 	struct fru_info fru;
 	uint8_t *spd_data, msg_data[4];
-	int len, offset;
+	uint32_t len, offset;
 
 	msg_data[0] = id;
 
@@ -1697,6 +1697,13 @@
 		}
 
 		len = rsp->data[0];
+		if(rsp->data_len < 1
+		   || len > rsp->data_len - 1
+		   || len > fru.size - offset)
+		{
+			printf(" Not enough buffer size");
+			return -1;
+		}
 		memcpy(&spd_data[offset], rsp->data + 1, len);
 		offset += len;
 	} while (offset < fru.size);

Places

File fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch of Package ipmitool

Places