Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1535615 > unrolled thread

[PATCH 1/1] net: bnx2x: fix improper return value

Started byPan Bian <bianpan201604@163.com>
First post2016-12-04 09:40 +0100
Last post2016-12-04 11:30 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 1/1] net: bnx2x: fix improper return value Pan Bian <bianpan201604@163.com> - 2016-12-04 09:40 +0100
    Re: [PATCH 1/1] net: bnx2x: fix improper return value Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-12-04 11:30 +0100

#1535615 — [PATCH 1/1] net: bnx2x: fix improper return value

FromPan Bian <bianpan201604@163.com>
Date2016-12-04 09:40 +0100
Subject[PATCH 1/1] net: bnx2x: fix improper return value
Message-ID<sKAuZ-4P9-7@gated-at.bofh.it>
From: Pan Bian <bianpan2016@163.com>

Marco BNX2X_ALLOC_AND_SET(arr, lbl, func) calls kmalloc() to allocate
memory, and jumps to label "lbl" if the allocation fails. Label "lbl"
first cleans memory and then returns variable rc. Before calling the
macro, the value of variable rc is 0. Because 0 means no error, the
callers of bnx2x_init_firmware() may be misled. This patch fixes the bug,
assigning "-ENOMEM" to rc before calling macro NX2X_ALLOC_AND_SET().

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=189141

Signed-off-by: Pan Bian <bianpan2016@163.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0cee4c0..6f9fc20 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13505,6 +13505,7 @@ static int bnx2x_init_firmware(struct bnx2x *bp)
 
 	/* Initialize the pointers to the init arrays */
 	/* Blob */
+	rc = -ENOMEM;
 	BNX2X_ALLOC_AND_SET(init_data, request_firmware_exit, be32_to_cpu_n);
 
 	/* Opcodes */
-- 
1.9.1

[toc] | [next] | [standalone]


#1535623

FromSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date2016-12-04 11:30 +0100
Message-ID<sKCdr-5Vw-1@gated-at.bofh.it>
In reply to#1535615
On 12/4/2016 11:39 AM, Pan Bian wrote:

> From: Pan Bian <bianpan2016@163.com>
>
> Marco BNX2X_ALLOC_AND_SET(arr, lbl, func) calls kmalloc() to allocate

    Macro.

> memory, and jumps to label "lbl" if the allocation fails. Label "lbl"
> first cleans memory and then returns variable rc. Before calling the
> macro, the value of variable rc is 0. Because 0 means no error, the
> callers of bnx2x_init_firmware() may be misled. This patch fixes the bug,
> assigning "-ENOMEM" to rc before calling macro NX2X_ALLOC_AND_SET().
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=189141
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
[...]

MBR, Sergei

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web