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

handle parameter out of range error without returning error code, fix segfault when no cipher suites defined

Browse Source
This commit is contained in:
Duncan Laurie 2005-04-20 20:36:01 +00:00
parent 805835ca69
commit 392454c646
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ipmitool/lib/ipmi_lanp.c
View File

@ -108,6 +108,14 @@ get_lan_param(struct ipmi_intf * intf, uint8_t chan, int param)
p->data_len = 0; p->data_len = 0;
return p; return p;
} }
if (rsp->ccode == 0xc9) {
/* parameter out of range
* return lan_param without data
*/
p->data = NULL;
p->data_len = 0;
return p;
}
if (rsp->ccode > 0) { if (rsp->ccode > 0) {
lprintf(LOG_INFO, "Get LAN Parameter command failed: %s", lprintf(LOG_INFO, "Get LAN Parameter command failed: %s",
val2str(rsp->ccode, completion_code_vals)); val2str(rsp->ccode, completion_code_vals));
@ -642,36 +650,33 @@ ipmi_lan_print(struct ipmi_intf * intf, uint8_t chan)
p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHER_SUPPORT); p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHER_SUPPORT);
if (p == NULL) if (p == NULL)
return -1; return -1;
else else if (p->data != NULL)
{ {
unsigned char cipher_suite_count = p->data[0];
p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHERS); p = get_lan_param(intf, chan, IPMI_LANP_RMCP_CIPHERS);
if (p == NULL) if (p == NULL)
return -1; return -1;
printf("%-24s: ", p->desc); printf("%-24s: ", p->desc);
if (cipher_suite_count == 0)
printf("None\n"); /* Now we're dangerous. There are only 15 fixed cipher
suite IDs, but the spec allows for 16 in the return data.*/
if ((p->data != NULL) && (p->data_len <= 16))
{
unsigned char cipher_suite_count = p->data[0];
unsigned int i;
for (i = 0; (i < 16) && (i < cipher_suite_count); ++i)
{
printf("%s%d",
(i > 0? ",": ""),
p->data[i + 1]);
}
printf("\n");
}
else else
{ {
/* Now we're dangerous. There are only 15 fixed cipher printf("None\n");
suite IDs, but the spec allows for 16 in the return data.*/
if ((p->data != NULL) && (p->data_len <= 16))
{
unsigned int i;
for (i = 0; (i < 16) && (i < cipher_suite_count); ++i)
{
printf("%s%d",
(i > 0? ",": ""),
p->data[i + 1]);
}
printf("\n");
}
} }
} }
/* RMCP+ Messaging Cipher Suite Privilege Levels */ /* RMCP+ Messaging Cipher Suite Privilege Levels */