Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ibmvnic: fix empty firmware version and errors cleanup

Browse Source 
This patch makes sure that the firmware version is never NULL. Moreover,
it also performs some cleanup on the error messages.

Fixes: a107311d7f ("ibmvnic: fix firmware version when no firmware level
has been provided by the VIOS server")
Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Desnes Augusto Nunes do Rosario 2018-02-05 14:33:55 -02:00 committed by David S. Miller
parent 4a31a6b19f
commit 21a2545bbe
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -3286,7 +3286,7 @@ static void handle_vpd_rsp(union ibmvnic_crq *crq,
struct ibmvnic_adapter *adapter) struct ibmvnic_adapter *adapter)
{ {
struct device *dev = &adapter->vdev->dev; struct device *dev = &adapter->vdev->dev;
unsigned char *substr = NULL, *ptr = NULL; unsigned char *substr = NULL;
u8 fw_level_len = 0; u8 fw_level_len = 0;
memset(adapter->fw_version, 0, 32); memset(adapter->fw_version, 0, 32);
@ -3306,10 +3306,6 @@ static void handle_vpd_rsp(union ibmvnic_crq *crq,
substr = strnstr(adapter->vpd->buff, "RM", adapter->vpd->len); substr = strnstr(adapter->vpd->buff, "RM", adapter->vpd->len);
if (!substr) { if (!substr) {
dev_info(dev, "Warning - No FW level has been provided in the VPD buffer by the VIOS Server\n"); dev_info(dev, "Warning - No FW level has been provided in the VPD buffer by the VIOS Server\n");
ptr = strncpy((char *)adapter->fw_version, "N/A",
3 * sizeof(char));
if (!ptr)
dev_err(dev, "Failed to inform that firmware version is unavailable to the adapter\n");
goto complete; goto complete;
} }
@ -3324,16 +3320,14 @@ static void handle_vpd_rsp(union ibmvnic_crq *crq,
/* copy firmware version string from vpd into adapter */ /* copy firmware version string from vpd into adapter */
if ((substr + 3 + fw_level_len) < if ((substr + 3 + fw_level_len) <
(adapter->vpd->buff + adapter->vpd->len)) { (adapter->vpd->buff + adapter->vpd->len)) {
ptr = strncpy((char *)adapter->fw_version, strncpy((char *)adapter->fw_version, substr + 3, fw_level_len);
substr + 3, fw_level_len);
if (!ptr)
dev_err(dev, "Failed to isolate FW level string\n");
} else { } else {
dev_info(dev, "FW substr extrapolated VPD buff\n"); dev_info(dev, "FW substr extrapolated VPD buff\n");
} }
complete: complete:
if (adapter->fw_version[0] == '\0')
strncpy((char *)adapter->fw_version, "N/A", 3 * sizeof(char));
complete(&adapter->fw_done); complete(&adapter->fw_done);
} }