Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1395101 > unrolled thread
| Started by | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| First post | 2016-05-05 15:20 +0200 |
| Last post | 2016-05-07 21:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[patch 1/2] netxen: fix error handling in netxen_get_flash_block() Dan Carpenter <dan.carpenter@oracle.com> - 2016-05-05 15:20 +0200
Re: [patch 1/2] netxen: fix error handling in netxen_get_flash_block() David Miller <davem@davemloft.net> - 2016-05-07 21:20 +0200
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2016-05-05 15:20 +0200 |
| Subject | [patch 1/2] netxen: fix error handling in netxen_get_flash_block() |
| Message-ID | <rvrma-Gs-11@gated-at.bofh.it> |
My static checker complained that "v" can be used unintialized if
netxen_rom_fast_read() returns -EIO. That function never actually
returns -1.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
index db80eb1..a320541 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
@@ -1015,20 +1015,24 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
{
int i, v, addr;
__le32 *ptr32;
+ int ret;
addr = base;
ptr32 = buf;
for (i = 0; i < size / sizeof(u32); i++) {
- if (netxen_rom_fast_read(adapter, addr, &v) == -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
+
*ptr32 = cpu_to_le32(v);
ptr32++;
addr += sizeof(u32);
}
if ((char *)buf + size > (char *)ptr32) {
__le32 local;
- if (netxen_rom_fast_read(adapter, addr, &v) == -1)
- return -1;
+ ret = netxen_rom_fast_read(adapter, addr, &v);
+ if (ret)
+ return ret;
local = cpu_to_le32(v);
memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32);
}
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2016-05-07 21:20 +0200 |
| Subject | Re: [patch 1/2] netxen: fix error handling in netxen_get_flash_block() |
| Message-ID | <rwfVE-7th-17@gated-at.bofh.it> |
| In reply to | #1395101 |
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 5 May 2016 16:18:46 +0300 > My static checker complained that "v" can be used unintialized if > netxen_rom_fast_read() returns -EIO. That function never actually > returns -1. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web