12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From 879f57c3b1ff17b1ca0dbdc8aac9c7a814e876fc Mon Sep 17 00:00:00 2001
- From: Chrostoper Ertl <chertl@microsoft.com>
- Date: Thu, 28 Nov 2019 16:44:18 +0000
- Subject: [PATCH] fru: Fix buffer overflow in ipmi_spd_print_fru
- 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.
- [Retrieve from:
- https://github.com/ipmitool/ipmitool/commit/840fb1cbb4fb365cb9797300e3374d4faefcdb10]
- Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
- ---
- lib/dimm_spd.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
- diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c
- index 41e30db..68f3b4f 100644
- --- a/lib/dimm_spd.c
- +++ b/lib/dimm_spd.c
- @@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
- 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 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
- }
-
- 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);
- --
- 2.20.1
|