Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752609AbcLDG3k (ORCPT ); Sun, 4 Dec 2016 01:29:40 -0500 Received: from m50-138.163.com ([123.125.50.138]:46237 "EHLO m50-138.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750815AbcLDG3j (ORCPT ); Sun, 4 Dec 2016 01:29:39 -0500 From: Pan Bian To: Yuval Mintz , Ariel Elior , everest-linux-l2@cavium.com, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH 1/1] net: ethernet: broadcom: fix improper return value Date: Sun, 4 Dec 2016 14:29:29 +0800 Message-Id: <1480832969-5888-1-git-send-email-bianpan201604@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: C9GowADH_ibIt0NY2wy7IQ--.516S3 X-Coremail-Antispam: 1Uf129KBjvJXoWrur4xZrWfWw13AFW5Wr17ZFb_yoW8Jry8p3 y7GryUCr4DGrWru3ykGw1rZrn8uay3JryqgrW7Z395Za1jy3WDJFsxKrW2qFyDCrWkC3Wa qr4Y9wn3Jas0qw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bT2-nUUUUU= X-Originating-IP: [114.243.30.33] X-CM-SenderInfo: held01tdqsiiqwquqiywtou0bp/1tbiUQo2+1WBA7IJUQAAsr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1169 Lines: 31 From: Pan Bian 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 --- 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