deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fru: fix memory leak in ipmi_spd_print_fru

Browse Source 
Fixed by using centralised exiting.

Signed-off-by: Václav Doležal <vdolezal@redhat.com>
This commit is contained in:
Vaclav Dolezal 2020-02-18 09:40:44 +01:00 committed by Alexander Amelkin
parent 284adfe2e2
commit b97a110721
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/dimm_spd.c
View File

@ -1620,8 +1620,10 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
struct ipmi_rq req; struct ipmi_rq req;
struct fru_info fru; struct fru_info fru;
uint8_t *spd_data, msg_data[4]; uint8_t *spd_data = NULL;
uint8_t msg_data[4];
uint32_t len, offset; uint32_t len, offset;
int rc = -1;
msg_data[0] = id; msg_data[0] = id;
@ -1634,12 +1636,12 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (!rsp) { if (!rsp) {
printf(" Device not present (No Response)\n"); printf(" Device not present (No Response)\n");
return -1; goto end;
} }
if (rsp->ccode) { if (rsp->ccode) {
printf(" Device not present (%s)\n", printf(" Device not present (%s)\n",
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; goto end;
} }
fru.size = (rsp->data[1] << 8) | rsp->data[0]; fru.size = (rsp->data[1] << 8) | rsp->data[0];
@ -1651,7 +1653,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
if (fru.size < 1) { if (fru.size < 1) {
lprintf(LOG_ERR, " Invalid FRU size %d", fru.size); lprintf(LOG_ERR, " Invalid FRU size %d", fru.size);
return -1; goto end;
} }
spd_data = malloc(fru.size); spd_data = malloc(fru.size);
@ -1659,7 +1661,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
if (!spd_data) { if (!spd_data) {
printf(" Unable to malloc memory for spd array of size=%d\n", printf(" Unable to malloc memory for spd array of size=%d\n",
fru.size); fru.size);
return -1; goto end;
} }
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
@ -1679,21 +1681,17 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (!rsp) { if (!rsp) {
printf(" Device not present (No Response)\n"); printf(" Device not present (No Response)\n");
free(spd_data); goto end;
spd_data = NULL;
return -1;
} }
if (rsp->ccode) { if (rsp->ccode) {
printf(" Device not present (%s)\n", printf(" Device not present (%s)\n",
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
free(spd_data);
spd_data = NULL;
/* Timeouts are acceptable. No DIMM in the socket */ /* Timeouts are acceptable. No DIMM in the socket */
if (rsp->ccode == 0xc3) if (rsp->ccode == 0xc3)
return 1; rc = 1;
return -1; goto end;
} }
len = rsp->data[0]; len = rsp->data[0];
@ -1702,7 +1700,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
|| len > fru.size - offset) || len > fru.size - offset)
{ {
printf(" Not enough buffer size"); printf(" Not enough buffer size");
return -1; goto end;
} }
memcpy(&spd_data[offset], rsp->data + 1, len); memcpy(&spd_data[offset], rsp->data + 1, len);
offset += len; offset += len;
@ -1710,8 +1708,10 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id)
/* now print spd info */ /* now print spd info */
ipmi_spd_print(spd_data, offset); ipmi_spd_print(spd_data, offset);
free(spd_data); rc = 0;
spd_data = NULL;
return 0; end:
free_n(&spd_data);
return rc;
} }