aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEilon Greenstein <eilong@broadcom.com>2009-08-12 08:23:48 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-12 23:02:53 -0700
commit54016b260e873d0d4d30cf1fdbd0cdcf0e26251b (patch)
treef085950545565ad9df727e937d4ad8d1fada3170
parent5ff7b6d4c129a430e355b2f88162a36d9e058f88 (diff)
downloadkernel_samsung_smdk4412-54016b260e873d0d4d30cf1fdbd0cdcf0e26251b.zip
kernel_samsung_smdk4412-54016b260e873d0d4d30cf1fdbd0cdcf0e26251b.tar.gz
kernel_samsung_smdk4412-54016b260e873d0d4d30cf1fdbd0cdcf0e26251b.tar.bz2
bnx2x: Check unzip return code
Without this check, when running out of memory, we will see PSOD's in bnx2x_init_fill() when doing a memset(). This is because at that time, bp->gunzip_buf is not pointing to a valid allocated space. Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2x_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 59aacd8..edd7b13 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -6512,7 +6512,9 @@ static int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
bp->dmae_ready = 0;
mutex_init(&bp->dmae_mutex);
- bnx2x_gunzip_init(bp);
+ rc = bnx2x_gunzip_init(bp);
+ if (rc)
+ return rc;
switch (load_code) {
case FW_MSG_CODE_DRV_LOAD_COMMON: