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: 329 hpm.1 upgrade fixes

Browse Source 
Fix commited for Dmitry Bazhenov
This commit is contained in:
Jim Mankovich 2014-08-11 11:17:41 -06:00
parent 58d510f90f
commit 9babab10f3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ipmi_hpmfwupg.c
View File

@ -1240,10 +1240,12 @@ HpmFwupgActionUploadFirmware(struct HpmfwupgComponentBitMask components,
} else { } else {
/* success, buf length is valid */ /* success, buf length is valid */
bufLengthIsSet = 1; bufLengthIsSet = 1;
if (blockLength > firmwareLength) { if (imageOffset + blockLength > firmwareLength ||
imageOffset + blockLength < blockLength) {
/* /*
* blockLength is the remaining length of the firmware to upload so * blockLength is the remaining length of the firmware to upload so
* if its greater than the firmware length then its kind of error * if imageOffset and blockLength sum is greater than the firmware
* length then its kind of error
*/ */
lprintf(LOG_NOTICE, lprintf(LOG_NOTICE,
"\n Error in Upload FIRMWARE command [rc=%d]\n", "\n Error in Upload FIRMWARE command [rc=%d]\n",
@ -1252,6 +1254,7 @@ HpmFwupgActionUploadFirmware(struct HpmfwupgComponentBitMask components,
"\n TotalSent:0x%x Img offset:0x%x Blk length:0x%x Fwlen:0x%x\n", "\n TotalSent:0x%x Img offset:0x%x Blk length:0x%x Fwlen:0x%x\n",
totalSent,imageOffset,blockLength,firmwareLength); totalSent,imageOffset,blockLength,firmwareLength);
rc = HPMFWUPG_ERROR; rc = HPMFWUPG_ERROR;
continue;
} }
totalSent += count; totalSent += count;
if (imageOffset != 0x00) { if (imageOffset != 0x00) {
@ -2301,7 +2304,8 @@ HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf,
* receive d5 (on the first get status) from * receive d5 (on the first get status) from
* the ipmi driver. * the ipmi driver.
*/ */
(upgStatusCmd.resp.lastCmdCompCode != 0x00 ) (upgStatusCmd.resp.lastCmdCompCode == 0x80 ||
upgStatusCmd.resp.lastCmdCompCode == 0xD5)
&& ((timeoutSec2 - timeoutSec1) < upgradeTimeout ) && ((timeoutSec2 - timeoutSec1) < upgradeTimeout )
&& (rc == HPMFWUPG_SUCCESS)) { && (rc == HPMFWUPG_SUCCESS)) {
/* Must wait at least 1000 ms between status requests */ /* Must wait at least 1000 ms between status requests */