diff options
author | Chrostoper Ertl <chertl@microsoft.com> | 2019-11-28 16:44:18 +0000 |
---|---|---|
committer | Alexander Amelkin <alexander@amelkin.msk.ru> | 2020-02-04 14:59:43 +0300 |
commit | 840fb1cbb4fb365cb9797300e3374d4faefcdb10 (patch) | |
tree | 4d48dccdf94c1dfb21bc4b4e9b7d74d44b96a0ca | |
parent | e824c23316ae50beb7f7488f2055ac65e8b341f2 (diff) | |
download | ipmitool-840fb1cbb4fb365cb9797300e3374d4faefcdb10.tar.gz |
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.
-rw-r--r-- | lib/dimm_spd.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c index 163a2c2..d559cb4 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); |