mirrors/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2026-01-21 08:34:29 +08:00
Code Issues Packages Projects Releases 2 Wiki Activity

sdr: harden against bad records

Browse Source 
Harden ipmi_sdr_get_record() against bad records

Signed-off-by: John Levon <john.levon@joyent.com>
This commit is contained in:
John Levon 2020-05-26 16:03:39 +01:00 committed by GitHub
parent b97a110721
commit dfe17311d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ipmi_sdr.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2012 Hewlett-Packard Development Company, L.P. * Copyright (c) 2012 Hewlett-Packard Development Company, L.P.
* Copyright 2020 Joyent, Inc.
* *
* Based on code from * Based on code from
* Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
@ -3159,7 +3160,8 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
sdr_rq.length, sdr_rq.offset); sdr_rq.length, sdr_rq.offset);
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (!rsp) {
if (!rsp || rsp->ccode == IPMI_CC_CANT_RET_NUM_REQ_BYTES) {
sdr_max_read_len = sdr_rq.length - 1; sdr_max_read_len = sdr_rq.length - 1;
if (sdr_max_read_len > 0) { if (sdr_max_read_len > 0) {
/* no response may happen if requests are bridged /* no response may happen if requests are bridged
@ -3170,14 +3172,7 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
data = NULL; data = NULL;
return NULL; return NULL;
} }
} } else if (rsp->ccode == IPMI_CC_RES_CANCELED) {
switch (rsp->ccode) {
case 0xca:
/* read too many bytes at once */
sdr_max_read_len = sdr_rq.length - 1;
continue;
case 0xc5:
/* lost reservation */ /* lost reservation */
lprintf(LOG_DEBUG, "SDR reservation cancelled. " lprintf(LOG_DEBUG, "SDR reservation cancelled. "
"Sleeping a bit and retrying..."); "Sleeping a bit and retrying...");
@ -3202,7 +3197,7 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
} }
memcpy(data + i, rsp->data + 2, sdr_rq.length); memcpy(data + i, rsp->data + 2, sdr_rq.length);
i += sdr_max_read_len; i += sdr_rq.length;
} }
return data; return data;