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

ID: 3608149 - ipmitool - set pointer to NULL after free()

Browse Source 
Commit is a response(and fix) to double-free bug in 'lib/ipmi_main.c' via
username. Now, pointers should be set to NULL after calling free().

Reported-by: Ales Ledvinka
This commit is contained in:
Zdenek Styblik 2013-03-29 14:40:21 +00:00
parent fd752420ec
commit 52c07d61f9
21 changed files with 363 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ipmitool/lib/ipmi_dcmi.c
View File

@ -2007,6 +2007,7 @@ static int ipmi_print_sensor_info(struct ipmi_intf *intf, uint16_t rec_id)
} }
free(rec); free(rec);
rec = NULL;
ipmi_sdr_end(intf, itr); ipmi_sdr_end(intf, itr);
return rc; return rc;

29
ipmitool/lib/ipmi_ekanalyzer.c
View File

@ -520,7 +520,8 @@ ipmi_ekanalyzer_main( struct ipmi_intf * intf, int argc, char ** argv )
printf("record has been removed!\n"); printf("record has been removed!\n");
} }
} }
free (filename[type_offset]); free(filename[type_offset]);
filename[type_offset] = NULL;
} }
} }
} }
@ -639,7 +640,8 @@ ipmi_ekanalyzer_main( struct ipmi_intf * intf, int argc, char ** argv )
} }
for (i = 0; i < (argc-1); i++){ for (i = 0; i < (argc-1); i++){
if (filename[i] != NULL){ if (filename[i] != NULL){
free (filename[i]); free(filename[i]);
filename[i] = NULL;
} }
} }
} /* End of ERROR_STATUS */ } /* End of ERROR_STATUS */
@ -975,7 +977,8 @@ ipmi_ek_display_power( int argc, char * opt, char ** filename, int * file_type )
/*Display the current*/ /*Display the current*/
ipmi_ek_display_current_descriptor( car, ipmi_ek_display_current_descriptor( car,
cur_desc, filename[num_file] ); cur_desc, filename[num_file] );
free (cur_desc); free(cur_desc);
cur_desc = NULL;
} }
/*Ref: AMC.0 specification, Table 3-10: Module Current Requirement*/ /*Ref: AMC.0 specification, Table 3-10: Module Current Requirement*/
else if ( list_record[num_file]->data[PICMG_ID_OFFSET] else if ( list_record[num_file]->data[PICMG_ID_OFFSET]
@ -1315,7 +1318,9 @@ static int ipmi_ek_matching_process( int * file_type, int index1, int index2,
} }
} }
free(amc_record1) ; free(amc_record1) ;
amc_record1 = NULL;
free(amc_record2) ; free(amc_record2) ;
amc_record2 = NULL;
} }
else{ else{
printf("No amc record is found!\n"); printf("No amc record is found!\n");
@ -1528,7 +1533,8 @@ ipmi_ek_check_physical_connectivity(
return_status = ERROR_STATUS; return_status = ERROR_STATUS;
} }
if (port_desc != NULL){ if (port_desc != NULL){
free (port_desc); free(port_desc);
port_desc = NULL;
} }
} }
return return_status; return return_status;
@ -1720,8 +1726,10 @@ ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
} }
} }
free (record1.matching_result); free(record1.matching_result);
free (record2.matching_result); record1.matching_result = NULL;
free(record2.matching_result);
record2.matching_result = NULL;
return result; return result;
} }
@ -2643,7 +2651,8 @@ ipmi_ek_display_board_info_area( FILE * input_file, char * board_type,
printf("-%02x", additional_data[i]); printf("-%02x", additional_data[i]);
} }
printf("\n"); printf("\n");
free (additional_data); free(additional_data);
additional_data = NULL;
(*board_length) -= size_board; (*board_length) -= size_board;
} }
} }
@ -2692,7 +2701,8 @@ ipmi_ek_display_board_info_area( FILE * input_file, char * board_type,
} }
} }
printf("\n"); printf("\n");
free (data); free(data);
data = NULL;
(*board_length) -= size_board; (*board_length) -= size_board;
file_offset = ftell (input_file); file_offset = ftell (input_file);
} }
@ -4016,7 +4026,8 @@ ipmi_ek_remove_record_from_list( struct ipmi_ek_multi_header * record,
(*list_last) = record->prev; (*list_last) = record->prev;
else else
record->next->prev = record->prev; record->next->prev = record->prev;
free (record); free(record);
record = NULL;
} }

7
ipmitool/lib/ipmi_firewall.c
View File

@ -881,6 +881,7 @@ ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_ERR, "Command 0x%02x not supported on LUN/NetFn pair %02x,%02x", lprintf(LOG_ERR, "Command 0x%02x not supported on LUN/NetFn pair %02x,%02x",
p.command, p.lun, p.netfn); p.command, p.lun, p.netfn);
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return 0; return 0;
} }
cmd = cmd =
@ -908,6 +909,7 @@ ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_ERR, "LUN or LUN/NetFn pair %02x,%02x not supported", lprintf(LOG_ERR, "LUN or LUN/NetFn pair %02x,%02x not supported",
p.lun, p.netfn); p.lun, p.netfn);
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return 0; return 0;
} }
n = p.netfn >> 1; n = p.netfn >> 1;
@ -948,6 +950,7 @@ ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
} }
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return ret; return ret;
} }
@ -997,6 +1000,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
ret = _gather_info(intf, &p, bmc_fn_support); ret = _gather_info(intf, &p, bmc_fn_support);
if (ret < 0) { if (ret < 0) {
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return ret; return ret;
} }
@ -1037,6 +1041,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
*/ */
} }
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return ret; return ret;
} }
@ -1073,6 +1078,7 @@ ipmi_firewall_reset(struct ipmi_intf * intf, int argc, char ** argv)
ret = _gather_info(intf, &p, bmc_fn_support); ret = _gather_info(intf, &p, bmc_fn_support);
if (ret < 0) { if (ret < 0) {
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return ret; return ret;
} }
@ -1095,6 +1101,7 @@ ipmi_firewall_reset(struct ipmi_intf * intf, int argc, char ** argv)
} }
free(bmc_fn_support); free(bmc_fn_support);
bmc_fn_support = NULL;
return ret; return ret;
} }

56
ipmitool/lib/ipmi_fru.c
View File

@ -679,6 +679,7 @@ write_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id,
} while ((doffset+off) < finish); } while ((doffset+off) < finish);
free(fru_bloc); free(fru_bloc);
fru_bloc = NULL;
return ((doffset+off) >= finish); return ((doffset+off) >= finish);
} }
@ -1017,6 +1018,7 @@ fru_area_print_multirec_bloc(struct ipmi_intf * intf, struct fru_info * fru,
lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)",i,i); lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)",i,i);
free(fru_data); free(fru_data);
fru_data = NULL;
} }
@ -1050,12 +1052,14 @@ fru_area_print_chassis(struct ipmi_intf * intf, struct fru_info * fru,
fru_len = 8 * fru_data[i + 1]; fru_len = 8 * fru_data[i + 1];
if (fru_len <= 0) { if (fru_len <= 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
/* read in the full fru */ /* read in the full fru */
if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) { if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
@ -1101,6 +1105,7 @@ fru_area_print_chassis(struct ipmi_intf * intf, struct fru_info * fru,
if (fru_area != NULL) { if (fru_area != NULL) {
free(fru_data); free(fru_data);
fru_data = NULL;
} }
} }
@ -1135,12 +1140,14 @@ fru_area_print_board(struct ipmi_intf * intf, struct fru_info * fru,
fru_len = 8 * fru_data[i + 1]; fru_len = 8 * fru_data[i + 1];
if (fru_len <= 0) { if (fru_len <= 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
/* read in the full fru */ /* read in the full fru */
if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) { if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
@ -1216,6 +1223,7 @@ fru_area_print_board(struct ipmi_intf * intf, struct fru_info * fru,
if (fru_area != NULL) { if (fru_area != NULL) {
free(fru_data); free(fru_data);
fru_data = NULL;
} }
} }
@ -1249,12 +1257,14 @@ fru_area_print_product(struct ipmi_intf * intf, struct fru_info * fru,
fru_len = 8 * fru_data[i + 1]; fru_len = 8 * fru_data[i + 1];
if (fru_len <= 0) { if (fru_len <= 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
/* read in the full fru */ /* read in the full fru */
if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) { if (read_fru_area(intf, fru, id, i, fru_len, fru_data) < 0) {
free(fru_data); free(fru_data);
fru_data = NULL;
return; return;
} }
@ -1343,6 +1353,7 @@ fru_area_print_product(struct ipmi_intf * intf, struct fru_info * fru,
if (fru_area != NULL) { if (fru_area != NULL) {
free(fru_data); free(fru_data);
fru_data = NULL;
} }
} }
@ -1541,6 +1552,7 @@ fru_area_print_multirec(struct ipmi_intf * intf, struct fru_info * fru,
lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)",i,i); lprintf(LOG_DEBUG ,"Multi-Record area ends at: %i (%xh)",i,i);
free(fru_data); free(fru_data);
fru_data = NULL;
} }
/* ipmi_fru_query_new_value - Query new values to replace original FRU content /* ipmi_fru_query_new_value - Query new values to replace original FRU content
@ -1579,6 +1591,7 @@ int ipmi_fru_query_new_value(uint8_t *data,int offset, size_t len)
} }
/* &data[offset++] */ /* &data[offset++] */
free(holder); free(holder);
holder = NULL;
status = TRUE; status = TRUE;
} }
else{ else{
@ -3143,8 +3156,10 @@ ipmi_fru_print_all(struct ipmi_intf * intf)
intf->target_addr = save_addr; intf->target_addr = save_addr;
} }
if (mc) if (mc) {
free(mc); free(mc);
mc = NULL;
}
continue; continue;
} }
@ -3156,12 +3171,15 @@ ipmi_fru_print_all(struct ipmi_intf * intf)
fru = (struct sdr_record_fru_locator *) fru = (struct sdr_record_fru_locator *)
ipmi_sdr_get_record(intf, header, itr); ipmi_sdr_get_record(intf, header, itr);
if (fru == NULL || !fru->logical) { if (fru == NULL || !fru->logical) {
if (fru) if (fru) {
free(fru); free(fru);
fru = NULL;
}
continue; continue;
} }
rc = ipmi_fru_print(intf, fru); rc = ipmi_fru_print(intf, fru);
free(fru); free(fru);
fru = NULL;
} }
ipmi_sdr_end(intf, itr); ipmi_sdr_end(intf, itr);
@ -3236,11 +3254,13 @@ ipmi_fru_read_to_bin(struct ipmi_intf * intf,
} else { } else {
lprintf(LOG_ERR, "Error opening file %s\n", pFileName); lprintf(LOG_ERR, "Error opening file %s\n", pFileName);
free(pFruBuf); free(pFruBuf);
pFruBuf = NULL;
return; return;
} }
fclose(pFile); fclose(pFile);
} }
free(pFruBuf); free(pFruBuf);
pFruBuf = NULL;
} }
static void static void
@ -3303,6 +3323,7 @@ ipmi_fru_write_from_bin(struct ipmi_intf * intf,
} }
free(pFruBuf); free(pFruBuf);
pFruBuf = NULL;
} }
/* ipmi_fru_write_help() - print help text for 'write' /* ipmi_fru_write_help() - print help text for 'write'
@ -3494,6 +3515,7 @@ ipmi_fru_edit_multirec(struct ipmi_intf * intf, uint8_t id ,
} while (!(h->format & 0x80) && (error != 1)); } while (!(h->format & 0x80) && (error != 1));
free(fru_data); free(fru_data);
fru_data = NULL;
} }
return 0; return 0;
} }
@ -3667,6 +3689,7 @@ ipmi_fru_get_multirec(struct ipmi_intf * intf, uint8_t id ,
} while (!(h->format & 0x80) && (error != 1)); } while (!(h->format & 0x80) && (error != 1));
free(fru_data); free(fru_data);
fru_data = NULL;
} }
return 0; return 0;
} }
@ -3708,6 +3731,7 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
lprintf(LOG_ERR, "Failed to get multirec from file '%s'.", pFileName); lprintf(LOG_ERR, "Failed to get multirec from file '%s'.", pFileName);
if (buf != NULL) { if (buf != NULL) {
free(buf); free(buf);
buf = NULL;
} }
return (-1); return (-1);
} }
@ -3715,6 +3739,7 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
lprintf(LOG_ERR, "Failed to adjust size from buffer."); lprintf(LOG_ERR, "Failed to adjust size from buffer.");
if (buf != NULL) { if (buf != NULL) {
free(buf); free(buf);
buf = NULL;
} }
return (-1); return (-1);
} }
@ -3723,11 +3748,13 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
lprintf(LOG_ERR, "Failed to write FRU area."); lprintf(LOG_ERR, "Failed to write FRU area.");
if (buf != NULL) { if (buf != NULL) {
free(buf); free(buf);
buf = NULL;
} }
return (-1); return (-1);
} }
if (buf != NULL) { if (buf != NULL) {
free(buf); free(buf);
buf = NULL;
} }
lprintf(LOG_INFO, "Done upgrading Ekey."); lprintf(LOG_INFO, "Done upgrading Ekey.");
return 0; return 0;
@ -4231,6 +4258,7 @@ ipmi_fru_read_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileName
{ {
lprintf(LOG_ERR, "Error opening file %s\n", pFileName); lprintf(LOG_ERR, "Error opening file %s\n", pFileName);
free(frubuf); free(frubuf);
frubuf = NULL;
return -1; return -1;
} }
fclose(pFile); fclose(pFile);
@ -4239,6 +4267,7 @@ ipmi_fru_read_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileName
printf("\n"); printf("\n");
free(frubuf); free(frubuf);
frubuf = NULL;
} }
} }
@ -4322,6 +4351,7 @@ ipmi_fru_write_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileNam
} }
free(frubuf); free(frubuf);
frubuf = NULL;
} }
fclose(fp); fclose(fp);
fp = NULL; fp = NULL;
@ -4723,6 +4753,7 @@ f_type, uint8_t f_index, char *f_string)
fru_field_offset_tmp = fru_field_offset; fru_field_offset_tmp = fru_field_offset;
if (fru_area != NULL) { if (fru_area != NULL) {
free(fru_area); free(fru_area);
fru_area = NULL;
} }
fru_area = (uint8_t *) get_fru_area_str(fru_data, &fru_field_offset); fru_area = (uint8_t *) get_fru_area_str(fru_data, &fru_field_offset);
} }
@ -4770,10 +4801,14 @@ f_type, uint8_t f_index, char *f_string)
} }
ipmi_fru_set_field_string_out: ipmi_fru_set_field_string_out:
if (fru_data != NULL) if (fru_data != NULL) {
free(fru_data); free(fru_data);
if (fru_area != NULL) fru_data = NULL;
}
if (fru_area != NULL) {
free(fru_area); free(fru_area);
fru_area = NULL;
}
return rc; return rc;
} }
@ -4902,6 +4937,7 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId,
fru_field_offset_tmp = fru_field_offset; fru_field_offset_tmp = fru_field_offset;
if (fru_area != NULL) { if (fru_area != NULL) {
free(fru_area); free(fru_area);
fru_area = NULL;
} }
fru_area = (uint8_t *) get_fru_area_str(fru_data_old, &fru_field_offset); fru_area = (uint8_t *) get_fru_area_str(fru_data_old, &fru_field_offset);
} }
@ -5157,12 +5193,18 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId,
printf("Done.\n"); printf("Done.\n");
ipmi_fru_set_field_string_rebuild_out: ipmi_fru_set_field_string_rebuild_out:
if (fru_area != NULL) if (fru_area != NULL) {
free(fru_area); free(fru_area);
if (fru_data_new != NULL) fru_area = NULL;
}
if (fru_data_new != NULL) {
free(fru_data_new); free(fru_data_new);
if (fru_data_old != NULL) fru_data_new = NULL;
}
if (fru_data_old != NULL) {
free(fru_data_old); free(fru_data_old);
fru_data_old = NULL;
}
return rc; return rc;
} }

5
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -1469,6 +1469,7 @@ int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename,
else else
{ {
free(fwupgCtx.pImageData); free(fwupgCtx.pImageData);
fwupgCtx.pImageData = NULL;
} }
} }
@ -1489,6 +1490,7 @@ int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename,
else else
{ {
free(fwupgCtx.pImageData); free(fwupgCtx.pImageData);
fwupgCtx.pImageData = NULL;
} }
} }
@ -1525,6 +1527,7 @@ int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename,
if ( rc != HPMFWUPG_SUCCESS ) if ( rc != HPMFWUPG_SUCCESS )
{ {
free(fwupgCtx.pImageData); free(fwupgCtx.pImageData);
fwupgCtx.pImageData = NULL;
} }
} }
@ -1538,6 +1541,7 @@ int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename,
if ( rc != HPMFWUPG_SUCCESS ) if ( rc != HPMFWUPG_SUCCESS )
{ {
free(fwupgCtx.pImageData); free(fwupgCtx.pImageData);
fwupgCtx.pImageData = NULL;
} }
} }
@ -1553,6 +1557,7 @@ int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename,
lprintf(LOG_NOTICE,"\nFirmware upgrade procedure successful\n"); lprintf(LOG_NOTICE,"\nFirmware upgrade procedure successful\n");
} }
free(fwupgCtx.pImageData); free(fwupgCtx.pImageData);
fwupgCtx.pImageData = NULL;
} }
else else
{ {

24
ipmitool/lib/ipmi_kontronoem.c
View File

@ -339,12 +339,14 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if (rsp == NULL) { if (rsp == NULL) {
printf(" Device not present (No Response)\n"); printf(" Device not present (No Response)\n");
free(sn); free(sn);
sn = NULL;
return -1; return -1;
} }
if (rsp->ccode > 0) { if (rsp->ccode > 0) {
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(sn); free(sn);
sn = NULL;
return(-1); return(-1);
} }
@ -354,6 +356,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if (fru.size < 1) { if (fru.size < 1) {
printf(" Invalid FRU size %d", fru.size); printf(" Invalid FRU size %d", fru.size);
free(sn); free(sn);
sn = NULL;
return -1; return -1;
} }
@ -376,6 +379,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
{ {
printf(" Device not present (No Response)\n"); printf(" Device not present (No Response)\n");
free(sn); free(sn);
sn = NULL;
return(-1); return(-1);
} }
if (rsp->ccode > 0) if (rsp->ccode > 0)
@ -383,6 +387,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
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(sn); free(sn);
sn = NULL;
return(-1); return(-1);
} }
@ -396,6 +401,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
printf(" Unknown FRU header version 0x%02x", printf(" Unknown FRU header version 0x%02x",
header.version); header.version);
free(sn); free(sn);
sn = NULL;
return(-1); return(-1);
} }
@ -409,6 +415,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
{ {
printf("Out of memory!"); printf("Out of memory!");
free(sn); free(sn);
sn = NULL;
return(-1); return(-1);
} }
@ -416,7 +423,9 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0) if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0)
{ {
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
@ -438,7 +447,9 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
{ {
printf("The length of the serial number in the FRU Board Area is wrong.\n"); printf("The length of the serial number in the FRU Board Area is wrong.\n");
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
@ -460,7 +471,9 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0) if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0)
{ {
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
@ -470,7 +483,9 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(read_fru_area(intf ,&fru ,0 ,(header.offset.product * 8) ,prod_sec_len , fru_data) < 0) if(read_fru_area(intf ,&fru ,0 ,(header.offset.product * 8) ,prod_sec_len , fru_data) < 0)
{ {
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
@ -499,7 +514,9 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(strlen(fru_area) != sn_size) if(strlen(fru_area) != sn_size)
{ {
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
printf("The length of the serial number in the FRU Product Area is wrong.\n"); printf("The length of the serial number in the FRU Product Area is wrong.\n");
return(-1); return(-1);
@ -523,12 +540,16 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(write_fru_area(intf, &fru, 0, (header.offset.product * 8), (header.offset.product * 8), prod_sec_len, fru_data) < 0) if(write_fru_area(intf, &fru, 0, (header.offset.product * 8), (header.offset.product * 8), prod_sec_len, fru_data) < 0)
{ {
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return -1; return -1;
} }
free(sn); free(sn);
sn = NULL;
free(fru_data); free(fru_data);
fru_data = NULL;
return(1); return(1);
@ -678,6 +699,7 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf * intf)
if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0) if(read_fru_area(intf ,&fru ,0 ,(header.offset.board * 8) ,board_sec_len , fru_data) < 0)
{ {
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
@ -698,10 +720,12 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf * intf)
if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0) if(write_fru_area(intf, &fru, 0, (header.offset.board * 8), (header.offset.board * 8), board_sec_len, fru_data) < 0)
{ {
free(fru_data); free(fru_data);
fru_data = NULL;
return(-1); return(-1);
} }
free(fru_data); free(fru_data);
fru_data = NULL;
return(1); return(1);
} }

104
ipmitool/lib/ipmi_main.c
View File

@ -320,6 +320,7 @@ ipmi_parse_hex(const char *str)
if (!isxdigit(*p)) { if (!isxdigit(*p)) {
lprintf(LOG_ERR, "Kg_hex is not hexadecimal number"); lprintf(LOG_ERR, "Kg_hex is not hexadecimal number");
free(out); free(out);
out = NULL;
return NULL; return NULL;
} }
@ -397,8 +398,10 @@ ipmi_main(int argc, char ** argv,
{ {
switch (argflag) { switch (argflag) {
case 'I': case 'I':
if (intfname) if (intfname) {
free(intfname); free(intfname);
intfname = NULL;
}
intfname = strdup(optarg); intfname = strdup(optarg);
if (intfname == NULL) { if (intfname == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -476,8 +479,10 @@ ipmi_main(int argc, char ** argv,
csv_output = 1; csv_output = 1;
break; break;
case 'H': case 'H':
if (hostname) if (hostname) {
free(hostname); free(hostname);
hostname = NULL;
}
hostname = strdup(optarg); hostname = strdup(optarg);
if (hostname == NULL) { if (hostname == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -485,8 +490,10 @@ ipmi_main(int argc, char ** argv,
} }
break; break;
case 'f': case 'f':
if (password) if (password) {
free(password); free(password);
password = NULL;
}
password = ipmi_password_file_read(optarg); password = ipmi_password_file_read(optarg);
if (password == NULL) if (password == NULL)
lprintf(LOG_ERR, "Unable to read password " lprintf(LOG_ERR, "Unable to read password "
@ -499,10 +506,13 @@ ipmi_main(int argc, char ** argv,
tmp_pass = getpass("Password: "); tmp_pass = getpass("Password: ");
#endif #endif
if (tmp_pass != NULL) { if (tmp_pass != NULL) {
if (password) if (password) {
free(password); free(password);
password = NULL;
}
password = strdup(tmp_pass); password = strdup(tmp_pass);
free(tmp_pass); free(tmp_pass);
tmp_pass = NULL;
if (password == NULL) { if (password == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
goto out_free; goto out_free;
@ -510,8 +520,10 @@ ipmi_main(int argc, char ** argv,
} }
break; break;
case 'k': case 'k':
if (kgkey) if (kgkey) {
free(kgkey); free(kgkey);
kgkey = NULL;
}
kgkey = strdup(optarg); kgkey = strdup(optarg);
if (kgkey == NULL) { if (kgkey == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -520,8 +532,10 @@ ipmi_main(int argc, char ** argv,
break; break;
case 'K': case 'K':
if ((tmp_env = getenv("IPMI_KGKEY"))) { if ((tmp_env = getenv("IPMI_KGKEY"))) {
if (kgkey) if (kgkey) {
free(kgkey); free(kgkey);
kgkey = NULL;
}
kgkey = strdup(tmp_env); kgkey = strdup(tmp_env);
if (kgkey == NULL) { if (kgkey == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -532,8 +546,10 @@ ipmi_main(int argc, char ** argv,
} }
break; break;
case 'y': case 'y':
if (kgkey) if (kgkey) {
free(kgkey); free(kgkey);
kgkey = NULL;
}
kgkey = ipmi_parse_hex(optarg); kgkey = ipmi_parse_hex(optarg);
if (kgkey == NULL) { if (kgkey == NULL) {
goto out_free; goto out_free;
@ -546,10 +562,13 @@ ipmi_main(int argc, char ** argv,
tmp_pass = getpass("Key: "); tmp_pass = getpass("Key: ");
#endif #endif
if (tmp_pass != NULL) { if (tmp_pass != NULL) {
if (kgkey) if (kgkey) {
free(kgkey); free(kgkey);
kgkey = NULL;
}
kgkey = strdup(tmp_pass); kgkey = strdup(tmp_pass);
free(tmp_pass); free(tmp_pass);
tmp_pass = NULL;
if (kgkey == NULL) { if (kgkey == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
goto out_free; goto out_free;
@ -557,8 +576,10 @@ ipmi_main(int argc, char ** argv,
} }
break; break;
case 'U': case 'U':
if (username) if (username) {
free(username); free(username);
username = NULL;
}
if (strlen(optarg) > 16) { if (strlen(optarg) > 16) {
lprintf(LOG_ERR, "Username is too long (> 16 bytes)"); lprintf(LOG_ERR, "Username is too long (> 16 bytes)");
goto out_free; goto out_free;
@ -570,8 +591,10 @@ ipmi_main(int argc, char ** argv,
} }
break; break;
case 'S': case 'S':
if (sdrcache) if (sdrcache) {
free(sdrcache); free(sdrcache);
sdrcache = NULL;
}
sdrcache = strdup(optarg); sdrcache = strdup(optarg);
if (sdrcache == NULL) { if (sdrcache == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -580,8 +603,10 @@ ipmi_main(int argc, char ** argv,
break; break;
#ifdef ENABLE_ALL_OPTIONS #ifdef ENABLE_ALL_OPTIONS
case 'o': case 'o':
if (oemtype) if (oemtype) {
free(oemtype); free(oemtype);
oemtype = NULL;
}
oemtype = strdup(optarg); oemtype = strdup(optarg);
if (oemtype == NULL) { if (oemtype == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -596,19 +621,25 @@ ipmi_main(int argc, char ** argv,
break; break;
case 'g': case 'g':
/* backwards compatible oem hack */ /* backwards compatible oem hack */
if (oemtype) if (oemtype) {
free(oemtype); free(oemtype);
oemtype = NULL;
}
oemtype = strdup("intelwv2"); oemtype = strdup("intelwv2");
break; break;
case 's': case 's':
/* backwards compatible oem hack */ /* backwards compatible oem hack */
if (oemtype) if (oemtype) {
free(oemtype); free(oemtype);
oemtype = NULL;
}
oemtype = strdup("supermicro"); oemtype = strdup("supermicro");
break; break;
case 'P': case 'P':
if (password) if (password) {
free(password); free(password);
password = NULL;
}
password = strdup(optarg); password = strdup(optarg);
if (password == NULL) { if (password == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -621,8 +652,10 @@ ipmi_main(int argc, char ** argv,
break; break;
case 'E': case 'E':
if ((tmp_env = getenv("IPMITOOL_PASSWORD"))) { if ((tmp_env = getenv("IPMITOOL_PASSWORD"))) {
if (password) if (password) {
free(password); free(password);
password = NULL;
}
password = strdup(tmp_env); password = strdup(tmp_env);
if (password == NULL) { if (password == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -630,8 +663,10 @@ ipmi_main(int argc, char ** argv,
} }
} }
else if ((tmp_env = getenv("IPMI_PASSWORD"))) { else if ((tmp_env = getenv("IPMI_PASSWORD"))) {
if (password) if (password) {
free(password); free(password);
password = NULL;
}
password = strdup(tmp_env); password = strdup(tmp_env);
if (password == NULL) { if (password == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -702,8 +737,10 @@ ipmi_main(int argc, char ** argv,
sol_escape_char = optarg[0]; sol_escape_char = optarg[0];
break; break;
case 'O': case 'O':
if (seloem) if (seloem) {
free(seloem); free(seloem);
seloem = NULL;
}
seloem = strdup(optarg); seloem = strdup(optarg);
if (seloem == NULL) { if (seloem == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
@ -765,6 +802,7 @@ ipmi_main(int argc, char ** argv,
if (tmp_pass != NULL) { if (tmp_pass != NULL) {
password = strdup(tmp_pass); password = strdup(tmp_pass);
free(tmp_pass); free(tmp_pass);
tmp_pass = NULL;
if (password == NULL) { if (password == NULL) {
lprintf(LOG_ERR, "%s: malloc failure", progname); lprintf(LOG_ERR, "%s: malloc failure", progname);
goto out_free; goto out_free;
@ -972,22 +1010,38 @@ ipmi_main(int argc, char ** argv,
out_free: out_free:
log_halt(); log_halt();
if (intfname != NULL) if (intfname != NULL) {
free(intfname); free(intfname);
if (hostname != NULL) intfname = NULL;
}
if (hostname != NULL) {
free(hostname); free(hostname);
if (username != NULL) hostname = NULL;
}
if (username != NULL) {
free(username); free(username);
if (password != NULL) username = NULL;
}
if (password != NULL) {
free(password); free(password);
if (oemtype != NULL) password = NULL;
}
if (oemtype != NULL) {
free(oemtype); free(oemtype);
if (seloem != NULL) oemtype = NULL;
}
if (seloem != NULL) {
free(seloem); free(seloem);
if (kgkey != NULL) seloem = NULL;
}
if (kgkey != NULL) {
free(kgkey); free(kgkey);
if (sdrcache != NULL) kgkey = NULL;
}
if (sdrcache != NULL) {
free(sdrcache); free(sdrcache);
sdrcache = NULL;
}
return rc; return rc;
} }

3
ipmitool/lib/ipmi_pef.c
View File

@ -679,6 +679,7 @@ ipmi_pef_list_policies(struct ipmi_intf * intf)
if (!tbl_size) { if (!tbl_size) {
if (!ptbl) { if (!ptbl) {
free(ptbl); free(ptbl);
ptbl = NULL;
} }
return; return;
} }
@ -734,6 +735,7 @@ ipmi_pef_list_policies(struct ipmi_intf * intf)
} }
} }
free(ptbl); free(ptbl);
ptbl = NULL;
} }
static void static void
@ -811,6 +813,7 @@ ipmi_pef_get_info(struct ipmi_intf * intf)
tbl_size = ipmi_pef_get_policy_table(intf, &ptbl); tbl_size = ipmi_pef_get_policy_table(intf, &ptbl);
if (!ptbl) { if (!ptbl) {
free(ptbl); free(ptbl);
ptbl = NULL;
} }
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));

68
ipmitool/lib/ipmi_sdr.c
View File

@ -2690,6 +2690,7 @@ ipmi_sdr_print_sdr(struct ipmi_intf *intf, uint8_t type)
lprintf(LOG_ERR, "ipmitool: malloc failure"); lprintf(LOG_ERR, "ipmitool: malloc failure");
if (rec != NULL) { if (rec != NULL) {
free(rec); free(rec);
rec = NULL;
} }
break; break;
} }
@ -2725,8 +2726,10 @@ ipmi_sdr_print_sdr(struct ipmi_intf *intf, uint8_t type)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -2826,10 +2829,12 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
if (rsp == NULL) { if (rsp == NULL) {
lprintf(LOG_ERR, "Get Device ID command failed"); lprintf(LOG_ERR, "Get Device ID command failed");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
if (rsp->ccode > 0) { if (rsp->ccode > 0) {
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
devid = (struct ipm_devid_rsp *) rsp->data; devid = (struct ipm_devid_rsp *) rsp->data;
@ -2844,6 +2849,7 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
} else { } else {
lprintf(LOG_ERR, "Error obtaining SDR info"); lprintf(LOG_ERR, "Error obtaining SDR info");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
} else { } else {
@ -2863,12 +2869,14 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
if (rsp == NULL) { if (rsp == NULL) {
lprintf(LOG_ERR, "Error obtaining SDR info"); lprintf(LOG_ERR, "Error obtaining SDR info");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
if (rsp->ccode > 0) { if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Error obtaining SDR info: %s", lprintf(LOG_ERR, "Error obtaining SDR info: %s",
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
@ -2897,6 +2905,7 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
if( ipmi_sdr_add_from_sensors( intf, 0 ) != 0 ) { if( ipmi_sdr_add_from_sensors( intf, 0 ) != 0 ) {
lprintf(LOG_ERR, "Could not build SDRR!"); lprintf(LOG_ERR, "Could not build SDRR!");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
} }
@ -2911,6 +2920,7 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
if (!rsp || !rsp->data_len || rsp->ccode) { if (!rsp || !rsp->data_len || rsp->ccode) {
printf("Err in cmd get sensor sdr info\n"); printf("Err in cmd get sensor sdr info\n");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
memcpy(&sdr_info, rsp->data, sizeof (sdr_info)); memcpy(&sdr_info, rsp->data, sizeof (sdr_info));
@ -2924,6 +2934,7 @@ ipmi_sdr_start(struct ipmi_intf *intf, int use_builtin)
&(itr->reservation)) < 0) { &(itr->reservation)) < 0) {
lprintf(LOG_ERR, "Unable to obtain SDR reservation"); lprintf(LOG_ERR, "Unable to obtain SDR reservation");
free(itr); free(itr);
itr = NULL;
return NULL; return NULL;
} }
@ -2996,6 +3007,7 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
continue; continue;
} else { } else {
free(data); free(data);
data = NULL;
return NULL; return NULL;
} }
} }
@ -3015,6 +3027,7 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
if (ipmi_sdr_get_reservation(intf, itr->use_built_in, if (ipmi_sdr_get_reservation(intf, itr->use_built_in,
&(itr->reservation)) < 0) { &(itr->reservation)) < 0) {
free(data); free(data);
data = NULL;
return NULL; return NULL;
} }
sdr_rq.reserve_id = itr->reservation; sdr_rq.reserve_id = itr->reservation;
@ -3024,6 +3037,7 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
/* special completion codes handled above */ /* special completion codes handled above */
if (rsp->ccode > 0 || rsp->data_len == 0) { if (rsp->ccode > 0 || rsp->data_len == 0) {
free(data); free(data);
data = NULL;
return NULL; return NULL;
} }
@ -3044,8 +3058,10 @@ ipmi_sdr_get_record(struct ipmi_intf * intf, struct sdr_get_rs * header,
void void
ipmi_sdr_end(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr) ipmi_sdr_end(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
{ {
if (itr) if (itr) {
free(itr); free(itr);
itr = NULL;
}
} }
/* __sdr_list_add - helper function to add SDR record to list /* __sdr_list_add - helper function to add SDR record to list
@ -3094,6 +3110,7 @@ __sdr_list_empty(struct sdr_record_list *head)
for (e = head; e != NULL; e = f) { for (e = head; e != NULL; e = f) {
f = e->next; f = e->next;
free(e); free(e);
e = NULL;
} }
head = NULL; head = NULL;
} }
@ -3115,32 +3132,45 @@ ipmi_sdr_list_empty(struct ipmi_intf *intf)
switch (list->type) { switch (list->type) {
case SDR_RECORD_TYPE_FULL_SENSOR: case SDR_RECORD_TYPE_FULL_SENSOR:
case SDR_RECORD_TYPE_COMPACT_SENSOR: case SDR_RECORD_TYPE_COMPACT_SENSOR:
if (list->record.common) if (list->record.common) {
free(list->record.common); free(list->record.common);
list->record.common = NULL;
}
break; break;
case SDR_RECORD_TYPE_EVENTONLY_SENSOR: case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
if (list->record.eventonly) if (list->record.eventonly) {
free(list->record.eventonly); free(list->record.eventonly);
list->record.eventonly = NULL;
}
break; break;
case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR: case SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR:
if (list->record.genloc) if (list->record.genloc) {
free(list->record.genloc); free(list->record.genloc);
list->record.genloc = NULL;
}
break; break;
case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR: case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
if (list->record.fruloc) if (list->record.fruloc) {
free(list->record.fruloc); free(list->record.fruloc);
list->record.fruloc = NULL;
}
break; break;
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
if (list->record.mcloc) if (list->record.mcloc) {
free(list->record.mcloc); free(list->record.mcloc);
list->record.mcloc = NULL;
}
break; break;
case SDR_RECORD_TYPE_ENTITY_ASSOC: case SDR_RECORD_TYPE_ENTITY_ASSOC:
if (list->record.entassoc) if (list->record.entassoc) {
free(list->record.entassoc); free(list->record.entassoc);
list->record.entassoc = NULL;
}
break; break;
} }
next = list->next; next = list->next;
free(list); free(list);
list = NULL;
} }
sdr_list_head = NULL; sdr_list_head = NULL;
@ -3210,6 +3240,7 @@ ipmi_sdr_find_sdr_bynumtype(struct ipmi_intf *intf, uint16_t gen_id, uint8_t num
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3250,8 +3281,10 @@ ipmi_sdr_find_sdr_bynumtype(struct ipmi_intf *intf, uint16_t gen_id, uint8_t num
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3334,6 +3367,7 @@ ipmi_sdr_find_sdr_bysensortype(struct ipmi_intf *intf, uint8_t type)
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3370,8 +3404,10 @@ ipmi_sdr_find_sdr_bysensortype(struct ipmi_intf *intf, uint8_t type)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3485,6 +3521,7 @@ ipmi_sdr_find_sdr_byentity(struct ipmi_intf *intf, struct entity_id *entity)
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3547,8 +3584,10 @@ ipmi_sdr_find_sdr_byentity(struct ipmi_intf *intf, struct entity_id *entity)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3618,6 +3657,7 @@ ipmi_sdr_find_sdr_bytype(struct ipmi_intf *intf, uint8_t type)
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3650,8 +3690,10 @@ ipmi_sdr_find_sdr_bytype(struct ipmi_intf *intf, uint8_t type)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3760,6 +3802,7 @@ ipmi_sdr_find_sdr_byid(struct ipmi_intf *intf, char *id)
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3827,8 +3870,10 @@ ipmi_sdr_find_sdr_byid(struct ipmi_intf *intf, char *id)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -3924,6 +3969,7 @@ ipmi_sdr_list_cache_fromfile(struct ipmi_intf *intf, const char *ifile)
ret = -1; ret = -1;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
break; break;
} }
@ -3937,9 +3983,11 @@ ipmi_sdr_list_cache_fromfile(struct ipmi_intf *intf, const char *ifile)
ret = -1; ret = -1;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
if (rec != NULL) { if (rec != NULL) {
free(rec); free(rec);
rec = NULL;
} }
break; break;
} }
@ -3972,8 +4020,10 @@ ipmi_sdr_list_cache_fromfile(struct ipmi_intf *intf, const char *ifile)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -4042,6 +4092,7 @@ ipmi_sdr_list_cache(struct ipmi_intf *intf)
if (rec == NULL) { if (rec == NULL) {
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -4074,8 +4125,10 @@ ipmi_sdr_list_cache(struct ipmi_intf *intf)
break; break;
default: default:
free(rec); free(rec);
rec = NULL;
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
continue; continue;
} }
@ -4303,6 +4356,7 @@ ipmi_sdr_dump_bin(struct ipmi_intf *intf, const char *ofile)
lprintf(LOG_ERR, "ipmitool: cannot obtain SDR record %04x", header->id); lprintf(LOG_ERR, "ipmitool: cannot obtain SDR record %04x", header->id);
if (sdrr != NULL) { if (sdrr != NULL) {
free(sdrr); free(sdrr);
sdrr = NULL;
} }
return -1; return -1;
} }

7
ipmitool/lib/ipmi_sdradd.c
View File

@ -139,6 +139,7 @@ ipmi_sdr_add_record(struct ipmi_intf *intf, struct sdr_record_list *sdrr)
if (partial_send(intf, &req, &id)) { if (partial_send(intf, &req, &id)) {
lprintf(LOG_ERR, "ipmitool: partial send error"); lprintf(LOG_ERR, "ipmitool: partial send error");
free(sdr_rq); free(sdr_rq);
sdr_rq = NULL;
return -1; return -1;
} }
@ -169,6 +170,7 @@ ipmi_sdr_add_record(struct ipmi_intf *intf, struct sdr_record_list *sdrr)
} }
free(sdr_rq); free(sdr_rq);
sdr_rq = NULL;
return rc; return rc;
} }
@ -304,6 +306,7 @@ sdr_copy_to_sdrr(struct ipmi_intf *intf, int use_builtin,
lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id); lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id);
} }
free(sdrr); free(sdrr);
sdrr = NULL;
} }
return rc; return rc;
} }
@ -608,6 +611,7 @@ ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
if ((sdrr->raw = malloc(sdrr->length)) == NULL) { if ((sdrr->raw = malloc(sdrr->length)) == NULL) {
lprintf(LOG_ERR, "ipmitool: malloc failure"); lprintf(LOG_ERR, "ipmitool: malloc failure");
free(sdrr); free(sdrr);
sdrr = NULL;
rc = -1; rc = -1;
break; break;
} }
@ -615,7 +619,9 @@ ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
if (read(fd, sdrr->raw, sdrr->length) != sdrr->length) { if (read(fd, sdrr->raw, sdrr->length) != sdrr->length) {
lprintf(LOG_ERR, "SDR from '%s' truncated", filename); lprintf(LOG_ERR, "SDR from '%s' truncated", filename);
free(sdrr->raw); free(sdrr->raw);
sdrr->raw = NULL;
free(sdrr); free(sdrr);
sdrr = NULL;
rc = -1; rc = -1;
break; break;
} }
@ -655,6 +661,7 @@ ipmi_sdr_add_from_file(struct ipmi_intf *intf, const char *ifile)
lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id); lprintf(LOG_ERR, "Cannot add SDR ID 0x%04x to repository...", sdrr->id);
} }
free(sdrr); free(sdrr);
sdrr = NULL;
} }
return rc; return rc;
} }

22
ipmitool/lib/ipmi_sel.c
View File

@ -155,10 +155,12 @@ int ipmi_sel_oem_init(const char * filename)
for (k=3; k<17; k++) { for (k=3; k<17; k++) {
if (sel_oem_msg[j].value[SEL_BYTE(k)] == -3) { if (sel_oem_msg[j].value[SEL_BYTE(k)] == -3) {
free(sel_oem_msg[j].string[SEL_BYTE(k)]); free(sel_oem_msg[j].string[SEL_BYTE(k)]);
sel_oem_msg[j].string[SEL_BYTE(k)] = NULL;
} }
} }
} }
free (sel_oem_msg); free(sel_oem_msg);
sel_oem_msg = NULL;
return -1; return -1;
} }
@ -609,16 +611,20 @@ char * get_dell_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
if (NULL == rsp) if (NULL == rsp)
{ {
lprintf(LOG_ERR, " Error getting system info"); lprintf(LOG_ERR, " Error getting system info");
if (desc != NULL) if (desc != NULL) {
free(desc); free(desc);
desc = NULL;
}
return NULL; return NULL;
} }
else if (rsp->ccode > 0) else if (rsp->ccode > 0)
{ {
lprintf(LOG_ERR, " Error getting system info: %s", lprintf(LOG_ERR, " Error getting system info: %s",
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
if (desc != NULL) if (desc != NULL) {
free(desc); free(desc);
desc = NULL;
}
return NULL; return NULL;
} }
version = rsp->data[4]; version = rsp->data[4];
@ -1170,6 +1176,7 @@ ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char
if (sfx) { if (sfx) {
sprintf(*desc, "%s (%s)", evt->desc, sfx); sprintf(*desc, "%s (%s)", evt->desc, sfx);
free(sfx); free(sfx);
sfx = NULL;
} else { } else {
sprintf(*desc, "%s", evt->desc); sprintf(*desc, "%s", evt->desc);
} }
@ -1215,6 +1222,7 @@ ipmi_get_event_desc(struct ipmi_intf * intf, struct sel_event_record * rec, char
sprintf(*desc, "(%s)",sfx); sprintf(*desc, "(%s)",sfx);
} }
free(sfx); free(sfx);
sfx = NULL;
} }
} }
@ -1540,8 +1548,10 @@ ipmi_sel_print_event_file(struct ipmi_intf * intf, struct sel_event_record * evt
evt->sel_type.standard_type.sensor_num, evt->sel_type.standard_type.sensor_num,
(description != NULL) ? description : "Unknown"); (description != NULL) ? description : "Unknown");
if (description != NULL) if (description != NULL) {
free(description); free(description);
description = NULL;
}
} }
void void
@ -1707,6 +1717,7 @@ ipmi_sel_print_std_entry(struct ipmi_intf * intf, struct sel_event_record * evt)
if (description) { if (description) {
printf("%s", description); printf("%s", description);
free(description); free(description);
description = NULL;
} }
if (evt->sel_type.standard_type.event_type == 0x6f) { if (evt->sel_type.standard_type.event_type == 0x6f) {
@ -1865,6 +1876,7 @@ ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_recor
printf(" Description : %s\n", printf(" Description : %s\n",
description ? description : ""); description ? description : "");
free(description); free(description);
description = NULL;
printf("\n"); printf("\n");
} }
@ -2019,6 +2031,7 @@ ipmi_sel_print_extended_entry_verbose(struct ipmi_intf * intf, struct sel_event_
printf(" Description : %s\n", printf(" Description : %s\n",
description ? description : ""); description ? description : "");
free(description); free(description);
description = NULL;
printf("\n"); printf("\n");
} }
@ -2317,6 +2330,7 @@ ipmi_sel_interpret(struct ipmi_intf * intf, unsigned long iana, const char * rea
} }
}while (status == 0); /* until file is completely read */ }while (status == 0); /* until file is completely read */
free(buffer); free(buffer);
buffer = NULL;
} /* if memory allocation succeeded */ } /* if memory allocation succeeded */
fclose(fp); fclose(fp);
} /* if file open succeeded */ } /* if file open succeeded */

1
ipmitool/lib/ipmi_sensor.c
View File

@ -438,6 +438,7 @@ ipmi_sensor_list(struct ipmi_intf *intf)
break; break;
} }
free(rec); free(rec);
rec = NULL;
/* fix for CR6604909: */ /* fix for CR6604909: */
/* mask failure of individual reads in sensor list command */ /* mask failure of individual reads in sensor list command */

1
ipmitool/lib/ipmi_sunoem.c
View File

@ -180,6 +180,7 @@ __sdr_list_empty(struct sdr_record_list * head)
for (e = head; e != NULL; e = f) { for (e = head; e != NULL; e = f) {
f = e->next; f = e->next;
free(e); free(e);
e = NULL;
} }
head = NULL; head = NULL;
} }

4
ipmitool/lib/log.c
View File

@ -132,8 +132,10 @@ void log_halt(void)
if (!logpriv) if (!logpriv)
return; return;
if (logpriv->name) if (logpriv->name) {
free(logpriv->name); free(logpriv->name);
logpriv->name = NULL;
}
if (logpriv->daemon) if (logpriv->daemon)
closelog(); closelog();

5
ipmitool/src/ipmievd.c
View File

@ -251,6 +251,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
lprintf(LOG_NOTICE, "%s%s sensor - %s", lprintf(LOG_NOTICE, "%s%s sensor - %s",
eintf->prefix, type, desc); eintf->prefix, type, desc);
free(desc); free(desc);
desc = NULL;
} else { } else {
lprintf(LOG_NOTICE, "%s%s sensor %02x", lprintf(LOG_NOTICE, "%s%s sensor %02x",
eintf->prefix, type, eintf->prefix, type,
@ -334,8 +335,10 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
break; break;
} }
if (desc) if (desc) {
free(desc); free(desc);
desc = NULL;
}
} }
/*************************************************************************/ /*************************************************************************/

4
ipmitool/src/ipmishell.c
View File

@ -121,17 +121,20 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
while ((pbuf = (char *)readline(RL_PROMPT)) != NULL) { while ((pbuf = (char *)readline(RL_PROMPT)) != NULL) {
if (strlen(pbuf) == 0) { if (strlen(pbuf) == 0) {
free(pbuf); free(pbuf);
pbuf = NULL;
continue; continue;
} }
if (strncmp(pbuf, "quit", 4) == 0 || if (strncmp(pbuf, "quit", 4) == 0 ||
strncmp(pbuf, "exit", 4) == 0) { strncmp(pbuf, "exit", 4) == 0) {
free(pbuf); free(pbuf);
pbuf = NULL;
return 0; return 0;
} }
if (strncmp(pbuf, "help", 4) == 0 || if (strncmp(pbuf, "help", 4) == 0 ||
strncmp(pbuf, "?", 1) == 0) { strncmp(pbuf, "?", 1) == 0) {
ipmi_cmd_print(intf->cmdlist); ipmi_cmd_print(intf->cmdlist);
free(pbuf); free(pbuf);
pbuf = NULL;
continue; continue;
} }
@ -201,6 +204,7 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
&(__argv[1])); &(__argv[1]));
free(pbuf); free(pbuf);
pbuf = NULL;
} }
printf("\n"); printf("\n");
return rc; return rc;

4
ipmitool/src/plugins/bmc/bmc.c
View File

@ -218,10 +218,12 @@ ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf, struct ipmi_rq *req)
if (putmsg(intf->fd, NULL, &sb, 0) < 0) { if (putmsg(intf->fd, NULL, &sb, 0) < 0) {
perror("BMC putmsg: "); perror("BMC putmsg: ");
free(msg); free(msg);
msg = NULL;
return (NULL); return (NULL);
} }
free(msg); free(msg);
msg = NULL;
sb.buf = malloc(MESSAGE_BUFSIZE); sb.buf = malloc(MESSAGE_BUFSIZE);
sb.maxlen = MESSAGE_BUFSIZE; sb.maxlen = MESSAGE_BUFSIZE;
@ -229,6 +231,7 @@ ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf, struct ipmi_rq *req)
if (getmsg(intf->fd, NULL, &sb, &flags) < 0) { if (getmsg(intf->fd, NULL, &sb, &flags) < 0) {
perror("BMC getmsg: "); perror("BMC getmsg: ");
free(sb.buf); free(sb.buf);
sb.buf = NULL;
return (NULL); return (NULL);
} }
@ -268,6 +271,7 @@ ipmi_bmc_send_cmd_putmsg(struct ipmi_intf *intf, struct ipmi_rq *req)
} }
free(sb.buf); free(sb.buf);
sb.buf = NULL;
return (ret); return (ret);
} }

31
ipmitool/src/plugins/lan/lan.c
View File

@ -173,9 +173,12 @@ ipmi_req_remove_entry(uint8_t seq, uint8_t cmd)
else else
ipmi_req_entries_tail = NULL; ipmi_req_entries_tail = NULL;
} }
if (e->msg_data) if (e->msg_data) {
free(e->msg_data); free(e->msg_data);
e->msg_data = NULL;
}
free(e); free(e);
e = NULL;
} }
} }
@ -194,6 +197,7 @@ ipmi_req_clear_entries(void)
e = p; e = p;
} else { } else {
free(e); free(e);
e = NULL;
break; break;
} }
} }
@ -393,6 +397,7 @@ ipmi_lan_ping(struct ipmi_intf * intf)
rv = ipmi_lan_send_packet(intf, data, len); rv = ipmi_lan_send_packet(intf, data, len);
free(data); free(data);
data = NULL;
if (rv < 0) { if (rv < 0) {
lprintf(LOG_ERR, "Unable to send IPMI presence ping packet"); lprintf(LOG_ERR, "Unable to send IPMI presence ping packet");
@ -706,8 +711,10 @@ ipmi_lan_build_cmd(struct ipmi_intf * intf, struct ipmi_rq * req, int isRetry)
// No need to add once again and we will re-use the existing node. // No need to add once again and we will re-use the existing node.
// Only thing we have to do is clear the msg_data as we create // Only thing we have to do is clear the msg_data as we create
// a new one below in the code for it. // a new one below in the code for it.
if (entry->msg_data) if (entry->msg_data) {
free(entry->msg_data); free(entry->msg_data);
entry->msg_data = NULL;
}
} }
else else
{ {
@ -1067,8 +1074,10 @@ ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp)
msg = ipmi_lan_build_rsp(intf, rsp, &len); msg = ipmi_lan_build_rsp(intf, rsp, &len);
if (len <= 0 || msg == NULL) { if (len <= 0 || msg == NULL) {
lprintf(LOG_ERR, "Invalid response packet"); lprintf(LOG_ERR, "Invalid response packet");
if (msg != NULL) if (msg != NULL) {
free(msg); free(msg);
msg = NULL;
}
return -1; return -1;
} }
@ -1077,13 +1086,17 @@ ipmi_lan_send_rsp(struct ipmi_intf * intf, struct ipmi_rs * rsp)
intf->session->addrlen); intf->session->addrlen);
if (rv < 0) { if (rv < 0) {
lprintf(LOG_ERR, "Packet send failed"); lprintf(LOG_ERR, "Packet send failed");
if (msg != NULL) if (msg != NULL) {
free(msg); free(msg);
msg = NULL;
}
return -1; return -1;
} }
if (msg != NULL) if (msg != NULL) {
free(msg); free(msg);
msg = NULL;
}
return 0; return 0;
} }
@ -1233,8 +1246,10 @@ ipmi_lan_send_sol_payload(struct ipmi_intf * intf,
msg = ipmi_lan_build_sol_msg(intf, payload, &len); msg = ipmi_lan_build_sol_msg(intf, payload, &len);
if (len <= 0 || msg == NULL) { if (len <= 0 || msg == NULL) {
lprintf(LOG_ERR, "Invalid SOL payload packet"); lprintf(LOG_ERR, "Invalid SOL payload packet");
if (msg != NULL) if (msg != NULL) {
free(msg); free(msg);
msg = NULL;
}
return NULL; return NULL;
} }
@ -1279,8 +1294,10 @@ ipmi_lan_send_sol_payload(struct ipmi_intf * intf,
} }
} }
if (msg != NULL) if (msg != NULL) {
free(msg); free(msg);
msg = NULL;
}
return rsp; return rsp;
} }

22
ipmitool/src/plugins/lanplus/lanplus.c
View File

@ -349,9 +349,12 @@ ipmi_req_remove_entry(uint8_t seq, uint8_t cmd)
ipmi_req_entries_tail = NULL; ipmi_req_entries_tail = NULL;
} }
if (e->msg_data) if (e->msg_data) {
free(e->msg_data); free(e->msg_data);
e->msg_data = NULL;
}
free(e); free(e);
e = NULL;
} }
} }
@ -564,6 +567,7 @@ ipmiv2_lan_ping(struct ipmi_intf * intf)
rv = ipmi_lan_send_packet(intf, data, len); rv = ipmi_lan_send_packet(intf, data, len);
free(data); free(data);
data = NULL;
if (rv < 0) { if (rv < 0) {
lprintf(LOG_ERR, "Unable to send IPMI presence ping packet"); lprintf(LOG_ERR, "Unable to send IPMI presence ping packet");
@ -1707,6 +1711,7 @@ ipmi_lanplus_build_v2x_msg(
lprintf(LOG_ERR, "unsupported payload type 0x%x", lprintf(LOG_ERR, "unsupported payload type 0x%x",
payload->payload_type); payload->payload_type);
free(msg); free(msg);
msg = NULL;
assert(0); assert(0);
break; break;
} }
@ -2313,6 +2318,7 @@ ipmi_lanplus_send_payload(
case IPMI_PAYLOAD_TYPE_RAKP_1: case IPMI_PAYLOAD_TYPE_RAKP_1:
case IPMI_PAYLOAD_TYPE_RAKP_3: case IPMI_PAYLOAD_TYPE_RAKP_3:
free(msg_data); free(msg_data);
msg_data = NULL;
break; break;
} }
@ -2794,6 +2800,7 @@ ipmi_lanplus_open_session(struct ipmi_intf * intf)
lprintf(LOG_WARNING, "Unsupported cipher suite ID : %d\n", lprintf(LOG_WARNING, "Unsupported cipher suite ID : %d\n",
session->cipher_suite_id); session->cipher_suite_id);
free(msg); free(msg);
msg = NULL;
return -1; return -1;
} }
@ -2842,6 +2849,7 @@ ipmi_lanplus_open_session(struct ipmi_intf * intf)
rsp = ipmi_lanplus_send_payload(intf, &v2_payload); rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
free(msg); free(msg);
msg = NULL;
if (verbose) if (verbose)
lanplus_dump_open_session_response(rsp); lanplus_dump_open_session_response(rsp);
@ -2972,6 +2980,7 @@ ipmi_lanplus_rakp1(struct ipmi_intf * intf)
lprintf(LOG_ERR, "ERROR generating random number " lprintf(LOG_ERR, "ERROR generating random number "
"in ipmi_lanplus_rakp1"); "in ipmi_lanplus_rakp1");
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
memcpy(msg + 8, session->v2_data.console_rand, 16); memcpy(msg + 8, session->v2_data.console_rand, 16);
@ -3001,6 +3010,7 @@ ipmi_lanplus_rakp1(struct ipmi_intf * intf)
"(Exceeds %d characters)", "(Exceeds %d characters)",
IPMI_MAX_USER_NAME_LENGTH); IPMI_MAX_USER_NAME_LENGTH);
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
memcpy(msg + 28, session->username, msg[27]); memcpy(msg + 28, session->username, msg[27]);
@ -3013,6 +3023,7 @@ ipmi_lanplus_rakp1(struct ipmi_intf * intf)
rsp = ipmi_lanplus_send_payload(intf, &v2_payload); rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
free(msg); free(msg);
msg = NULL;
if (rsp == NULL) if (rsp == NULL)
{ {
@ -3136,6 +3147,7 @@ ipmi_lanplus_rakp3(struct ipmi_intf * intf)
/* Error */ /* Error */
lprintf(LOG_INFO, "> Error generating RAKP 3 authcode"); lprintf(LOG_INFO, "> Error generating RAKP 3 authcode");
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
else else
@ -3150,6 +3162,7 @@ ipmi_lanplus_rakp3(struct ipmi_intf * intf)
/* Error */ /* Error */
lprintf(LOG_INFO, "> Error generating session integrity key"); lprintf(LOG_INFO, "> Error generating session integrity key");
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
else if (lanplus_generate_k1(session)) else if (lanplus_generate_k1(session))
@ -3157,6 +3170,7 @@ ipmi_lanplus_rakp3(struct ipmi_intf * intf)
/* Error */ /* Error */
lprintf(LOG_INFO, "> Error generating K1 key"); lprintf(LOG_INFO, "> Error generating K1 key");
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
else if (lanplus_generate_k2(session)) else if (lanplus_generate_k2(session))
@ -3164,6 +3178,7 @@ ipmi_lanplus_rakp3(struct ipmi_intf * intf)
/* Error */ /* Error */
lprintf(LOG_INFO, "> Error generating K1 key"); lprintf(LOG_INFO, "> Error generating K1 key");
free(msg); free(msg);
msg = NULL;
return 1; return 1;
} }
} }
@ -3172,6 +3187,7 @@ ipmi_lanplus_rakp3(struct ipmi_intf * intf)
rsp = ipmi_lanplus_send_payload(intf, &v2_payload); rsp = ipmi_lanplus_send_payload(intf, &v2_payload);
free(msg); free(msg);
msg = NULL;
if (session->v2_data.rakp2_return_code != IPMI_RAKP_STATUS_NO_ERRORS) if (session->v2_data.rakp2_return_code != IPMI_RAKP_STATUS_NO_ERRORS)
{ {
@ -3242,8 +3258,10 @@ ipmi_lanplus_close(struct ipmi_intf * intf)
ipmi_req_clear_entries(); ipmi_req_clear_entries();
if (intf->session) if (intf->session) {
free(intf->session); free(intf->session);
intf->session = NULL;
}
intf->session = NULL; intf->session = NULL;
intf->opened = 0; intf->opened = 0;

10
ipmitool/src/plugins/lanplus/lanplus_crypt.c
View File

@ -178,6 +178,7 @@ int lanplus_rakp2_hmac_matches(const struct ipmi_session * session,
&macLength); &macLength);
free(buffer); free(buffer);
buffer = NULL;
if (verbose > 2) if (verbose > 2)
@ -310,6 +311,7 @@ int lanplus_rakp4_hmac_matches(const struct ipmi_session * session,
free(buffer); free(buffer);
buffer = NULL;
assert(macLength == 20); assert(macLength == 20);
return (memcmp(bmc_mac, mac, 12) == 0); return (memcmp(bmc_mac, mac, 12) == 0);
} }
@ -425,6 +427,7 @@ int lanplus_generate_rakp3_authcode(uint8_t * output_buffer
free(input_buffer); free(input_buffer);
input_buffer = NULL;
return ret; return ret;
} }
@ -549,6 +552,7 @@ int lanplus_generate_sik(struct ipmi_session * session)
&mac_length); &mac_length);
free(input_buffer); free(input_buffer);
input_buffer = NULL;
assert(mac_length == 20); assert(mac_length == 20);
/* /*
@ -719,8 +723,10 @@ int lanplus_encrypt_payload(uint8_t crypt_alg,
if (lanplus_rand(output, IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE)) if (lanplus_rand(output, IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE))
{ {
lprintf(LOG_ERR, "lanplus_encrypt_payload: Error generating IV"); lprintf(LOG_ERR, "lanplus_encrypt_payload: Error generating IV");
if (padded_input != NULL) if (padded_input != NULL) {
free(padded_input); free(padded_input);
padded_input = NULL;
}
return 1; return 1;
} }
@ -741,6 +747,7 @@ int lanplus_encrypt_payload(uint8_t crypt_alg,
bytes_encrypted; bytes_encrypted;
free(padded_input); free(padded_input);
padded_input = NULL;
return 0; return 0;
} }
@ -904,5 +911,6 @@ int lanplus_decrypt_payload(uint8_t crypt_alg,
} }
free(decrypted_payload); free(decrypted_payload);
decrypted_payload = NULL;
return (bytes_decrypted == 0); return (bytes_decrypted == 0);
} }

26
ipmitool/src/plugins/open/open.c
View File

@ -272,8 +272,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (ioctl(intf->fd, IPMICTL_SEND_COMMAND, &_req) < 0) { if (ioctl(intf->fd, IPMICTL_SEND_COMMAND, &_req) < 0) {
lperror(LOG_ERR, "Unable to send command"); lperror(LOG_ERR, "Unable to send command");
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return NULL; return NULL;
} }
@ -282,8 +284,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
*/ */
if (intf->noanswer) { if (intf->noanswer) {
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return NULL; return NULL;
} }
@ -292,14 +296,18 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (select(intf->fd+1, &rset, NULL, NULL, NULL) < 0) { if (select(intf->fd+1, &rset, NULL, NULL, NULL) < 0) {
lperror(LOG_ERR, "I/O Error"); lperror(LOG_ERR, "I/O Error");
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return NULL; return NULL;
} }
if (FD_ISSET(intf->fd, &rset) == 0) { if (FD_ISSET(intf->fd, &rset) == 0) {
lprintf(LOG_ERR, "No data available"); lprintf(LOG_ERR, "No data available");
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return NULL; return NULL;
} }
@ -312,8 +320,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
if (ioctl(intf->fd, IPMICTL_RECEIVE_MSG_TRUNC, &recv) < 0) { if (ioctl(intf->fd, IPMICTL_RECEIVE_MSG_TRUNC, &recv) < 0) {
lperror(LOG_ERR, "Error receiving message"); lperror(LOG_ERR, "Error receiving message");
if (errno != EMSGSIZE) { if (errno != EMSGSIZE) {
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return NULL; return NULL;
} }
} }
@ -372,8 +382,10 @@ ipmi_openipmi_send_cmd(struct ipmi_intf * intf, struct ipmi_rq * req)
rsp.data[recv.msg.data_len] = 0; rsp.data[recv.msg.data_len] = 0;
} }
if (data != NULL) if (data != NULL) {
free(data); free(data);
data = NULL;
}
return &rsp; return &rsp;
} }