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

ID: 267 - Corruption in "lan alert print" output

Browse Source 
Commit fixes corruption in 'lan alert print' output. This bug comes from two
consecutive calls to get_lan_param_select() which returns pointer to struct. In
the end, the second call would over-write data from the first one, as 'ptype'
and 'paddr' were pointing at the same address.

Thanks to Rob Swindell for logging this bug and testing the patch.
This commit is contained in:
Zdenek Styblik 2013-08-16 09:36:17 +00:00
parent f6dbaf231b
commit 5177966867
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ipmitool/ChangeLog
View File

@ -118,6 +118,7 @@ version 1.8.13rc0 2013-08-09
* ID: 212 - 'lib/ipmi_dcmi.c' - possible int *flow * ID: 212 - 'lib/ipmi_dcmi.c' - possible int *flow
* ID: 264 - incorrect array index in get_lan_param_select() * ID: 264 - incorrect array index in get_lan_param_select()
* ID: 269 - Fixes for configure.in for cross compilation * ID: 269 - Fixes for configure.in for cross compilation
* ID: 267 - Corruption in "lan alert print" output
version 1.8.12 released 2012-08-09 version 1.8.12 released 2012-08-09

46
ipmitool/lib/ipmi_lanp.c
View File

@ -1772,26 +1772,38 @@ is_alert_destination(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
static int static int
ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert) ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
{ {
struct lan_param * ptype, * paddr; # define PTYPE_LEN 4
# define PADDR_LEN 13
struct lan_param *lp_ptr = NULL;
int isack = 0; int isack = 0;
uint8_t ptype[PTYPE_LEN];
uint8_t paddr[PADDR_LEN];
ptype = get_lan_param_select(intf, channel, IPMI_LANP_DEST_TYPE, alert); lp_ptr = get_lan_param_select(intf, channel, IPMI_LANP_DEST_TYPE, alert);
paddr = get_lan_param_select(intf, channel, IPMI_LANP_DEST_ADDR, alert); if (lp_ptr == NULL || lp_ptr->data == NULL
if (ptype == NULL || paddr == NULL) || lp_ptr->data_len < PTYPE_LEN) {
return -1; return (-1);
if (ptype->data == NULL || paddr->data == NULL) }
return -1; memcpy(ptype, lp_ptr->data, PTYPE_LEN);
lp_ptr = get_lan_param_select(intf, channel, IPMI_LANP_DEST_ADDR, alert);
if (lp_ptr == NULL || lp_ptr->data == NULL
|| lp_ptr->data_len < PADDR_LEN) {
return (-1);
}
memcpy(paddr, lp_ptr->data, PADDR_LEN);
printf("%-24s: %d\n", "Alert Destination", printf("%-24s: %d\n", "Alert Destination",
ptype->data[0]); ptype[0]);
if (ptype->data[1] & 0x80) if (ptype[1] & 0x80) {
isack = 1; isack = 1;
}
printf("%-24s: %s\n", "Alert Acknowledge", printf("%-24s: %s\n", "Alert Acknowledge",
isack ? "Acknowledged" : "Unacknowledged"); isack ? "Acknowledged" : "Unacknowledged");
printf("%-24s: ", "Destination Type"); printf("%-24s: ", "Destination Type");
switch (ptype->data[1] & 0x7) { switch (ptype[1] & 0x7) {
case 0: case 0:
printf("PET Trap\n"); printf("PET Trap\n");
break; break;
@ -1808,26 +1820,26 @@ ipmi_lan_alert_print(struct ipmi_intf * intf, uint8_t channel, uint8_t alert)
printf("%-24s: %d\n", printf("%-24s: %d\n",
isack ? "Acknowledge Timeout" : "Retry Interval", isack ? "Acknowledge Timeout" : "Retry Interval",
ptype->data[2]); ptype[2]);
printf("%-24s: %d\n", "Number of Retries", printf("%-24s: %d\n", "Number of Retries",
ptype->data[3] & 0x7); ptype[3] & 0x7);
if ((paddr->data[1] & 0xf0) != 0) { if ((paddr[1] & 0xf0) != 0) {
/* unknown address format */ /* unknown address format */
printf("\n"); printf("\n");
return 0; return 0;
} }
printf("%-24s: %s\n", "Alert Gateway", printf("%-24s: %s\n", "Alert Gateway",
(paddr->data[2] & 1) ? "Backup" : "Default"); (paddr[2] & 1) ? "Backup" : "Default");
printf("%-24s: %d.%d.%d.%d\n", "Alert IP Address", printf("%-24s: %d.%d.%d.%d\n", "Alert IP Address",
paddr->data[3], paddr->data[4], paddr->data[5], paddr->data[6]); paddr[3], paddr[4], paddr[5], paddr[6]);
printf("%-24s: %02x:%02x:%02x:%02x:%02x:%02x\n", "Alert MAC Address", printf("%-24s: %02x:%02x:%02x:%02x:%02x:%02x\n", "Alert MAC Address",
paddr->data[7], paddr->data[8], paddr->data[9], paddr[7], paddr[8], paddr[9],
paddr->data[10], paddr->data[11], paddr->data[12]); paddr[10], paddr[11], paddr[12]);
printf("\n"); printf("\n");
return 0; return 0;