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:477 - fru: Fix decoding of non-text data in get_fru_area_str()

Browse Source 
The get_fru_area_str() function is used to decode FRU area
fields into text. Areas may be encoded as text, binary,
BCDplus or 6-bit ASCII. Decoding of 6-bit ASCII and BCDplus
was broken. There was an error in the formulas used to
calculate the resulting string length, plus the decoding
formulas for BCDplus was wrong.

For BCDplus the resulting length was considered equal
the encoded data length, while in fact it's twice as big.
Only one character instead of two was being extracted from
a single input byte while two nibbles must have been taken
into account.

For 6-bit ASCII rounding of 3 to 4 bytes conversion was done
improperly adding 2 to the original length instead of the
result of multiplication.
This commit is contained in:
Alexander Amelkin 2017-02-02 15:25:44 +03:00
parent 7b0302cef5
commit 497f7767cd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/ipmi_fru.c
View File

@ -107,7 +107,7 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
{ {
static const char bcd_plus[] = "0123456789 -.:,_"; static const char bcd_plus[] = "0123456789 -.:,_";
char * str; char * str;
int len, off, size, i, j, k, typecode; int len, off, size, i, j, k, typecode, char_idx;
union { union {
uint32_t bits; uint32_t bits;
char chars[4]; char chars[4];
@ -126,15 +126,15 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
switch (typecode) { switch (typecode) {
case 0: /* 00b: binary/unspecified */ case 0: /* 00b: binary/unspecified */
/* hex dump -> 2x length */ case 1: /* 01b: BCD plus */
/* hex dump or BCD -> 2x length */
size = (len * 2); size = (len * 2);
break; break;
case 2: /* 10b: 6-bit ASCII */ case 2: /* 10b: 6-bit ASCII */
/* 4 chars per group of 1-3 bytes */ /* 4 chars per group of 1-3 bytes */
size = ((((len+2)*4)/3) & ~3); size = (((len * 4 + 2) / 3) & ~3);
break; break;
case 3: /* 11b: 8-bit ASCII */ case 3: /* 11b: 8-bit ASCII */
case 1: /* 01b: BCD plus */
/* no length adjustment */ /* no length adjustment */
size = len; size = len;
break; break;
@ -149,7 +149,7 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
return NULL; return NULL;
memset(str, 0, size+1); memset(str, 0, size+1);
if (len == 0) { if (size == 0) {
str[0] = '\0'; str[0] = '\0';
*offset = off; *offset = off;
return str; return str;
@ -157,12 +157,12 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
switch (typecode) { switch (typecode) {
case 0: /* Binary */ case 0: /* Binary */
strncpy(str, buf2str(&data[off], len), len*2); strncpy(str, buf2str(&data[off], len), size);
break; break;
case 1: /* BCD plus */ case 1: /* BCD plus */
for (k=0; k<len; k++) for (k = 0; k < size; k++)
str[k] = bcd_plus[(data[off+k] & 0x0f)]; str[k] = bcd_plus[((data[off + k / 2] >> ((k % 2) ? 0 : 4)) & 0x0f)];
str[k] = '\0'; str[k] = '\0';
break; break;
@ -174,13 +174,13 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
u.chars[3] = data[off+i]; u.chars[3] = data[off+i];
u.chars[2] = (k > 1 ? data[off+i+1] : 0); u.chars[2] = (k > 1 ? data[off+i+1] : 0);
u.chars[1] = (k > 2 ? data[off+i+2] : 0); u.chars[1] = (k > 2 ? data[off+i+2] : 0);
#define CHAR_IDX 3 char_idx = 3;
#else #else
memcpy((void *)&u.bits, &data[off+i], k); memcpy((void *)&u.bits, &data[off+i], k);
#define CHAR_IDX 0 char_idx = 0;
#endif #endif
for (k=0; k<4; k++) { for (k=0; k<4; k++) {
str[j++] = ((u.chars[CHAR_IDX] & 0x3f) + 0x20); str[j++] = ((u.chars[char_idx] & 0x3f) + 0x20);
u.bits >>= 6; u.bits >>= 6;
} }
} }
@ -188,8 +188,8 @@ char * get_fru_area_str(uint8_t * data, uint32_t * offset)
break; break;
case 3: case 3:
memcpy(str, &data[off], len); memcpy(str, &data[off], size);
str[len] = '\0'; str[size] = '\0';
break; break;
} }