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:479 - ekanalyzer: fix processing of custom mfg. fields

Browse Source 
Ekanalyzer was not reading the type/length byte for the 2nd and
subsequent custom fields. Also the message it displayed when
lacked data for custom fields was very relaxing and incorrect.
This commit is contained in:
Alexander Amelkin 2017-01-24 14:09:57 +03:00
parent 840f573083
commit 7b0302cef5
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ipmi_ekanalyzer.c
View File

@ -2697,6 +2697,7 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
int ret = 0; int ret = 0;
unsigned char len = 0; unsigned char len = 0;
unsigned int size_board = 0; unsigned int size_board = 0;
int custom_fields = 0;
if (input_file == NULL || board_type == NULL if (input_file == NULL || board_type == NULL
|| board_length == NULL) { || board_length == NULL) {
return (size_t)(-1); return (size_t)(-1);
@ -2758,7 +2759,12 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
/* take the rest of data in the area minus 1 byte of /* take the rest of data in the area minus 1 byte of
* checksum * checksum
*/ */
printf("Additional Custom Mfg. length: 0x%02x\n", len); if (custom_fields) {
printf("End of Custom Mfg. fields (0x%02x)\n", len);
} else {
printf("No Additional Custom Mfg. fields (0x%02x)\n", len);
}
padding = (*board_length) - 1; padding = (*board_length) - 1;
if ((padding > 0) && (!feof(input_file))) { if ((padding > 0) && (!feof(input_file))) {
printf("Unused space: %d (bytes)\n", padding); printf("Unused space: %d (bytes)\n", padding);
@ -2772,6 +2778,7 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
printf("Checksum: 0x%02x\n", checksum); printf("Checksum: 0x%02x\n", checksum);
goto out; goto out;
} }
custom_fields++;
printf("Additional Custom Mfg. length: 0x%02x\n", len); printf("Additional Custom Mfg. length: 0x%02x\n", len);
if ((size_board > 0) && (size_board < (*board_length))) { if ((size_board > 0) && (size_board < (*board_length))) {
unsigned char *additional_data, *str; unsigned char *additional_data, *str;
@ -2801,9 +2808,17 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
additional_data = NULL; additional_data = NULL;
(*board_length) -= size_board; (*board_length) -= size_board;
ret = fread(&len, 1, 1, input_file);
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid Length!");
goto out;
}
(*board_length)--;
size_board = (len & 0x3f);
} }
else { else {
printf("No Additional Custom Mfg. %d\n", *board_length); printf("ERROR: File has insufficient data (%d bytes) for the "
"Additional Custom Mfg. field\n", *board_length);
goto out; goto out;
} }
} }