diff mbox series

[4.9,06/30] bnx2x: fix an error code in bnx2x_nic_load()

Message ID	20210813150522.652304555@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 06/30] bnx2x: fix an error code in bnx2x_nic_load() Date: Fri, 13 Aug 2021 17:06:34 +0200 Message-Id: <20210813150522.652304555@linuxfoundation.org> In-Reply-To: <20210813150522.445553924@linuxfoundation.org> References: <20210813150522.445553924@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/30] scsi: sr: Return correct event when media event code is 3 [4.9,03/30] media: videobuf2-core: dequeue if start_streaming fails [4.9,04/30] net: natsemi: Fix missing pci_disable_device() in probe and remove [4.9,05/30] mips: Fix non-POSIX regexp [4.9,06/30] bnx2x: fix an error code in bnx2x_nic_load() [4.9,07/30] net: pegasus: fix uninit-value in get_interrupt_interval [4.9,08/30] net: fec: fix use-after-free in fec_drv_remove [4.9,09/30] net: vxge: fix use-after-free in vxge_device_unregister [4.9,10/30] Bluetooth: defer cleanup of resources in hci_unregister_dev() [4.9,11/30] USB: usbtmc: Fix RCU stall warning [4.9,12/30] USB: serial: option: add Telit FD980 composition 0x1056 [4.9,13/30] USB: serial: ch341: fix character loss at high transfer rates [4.9,14/30] USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2 [4.9,15/30] usb: otg-fsm: Fix hrtimer list corruption [4.9,16/30] scripts/tracing: fix the bug that cant parse raw_trace_func [4.9,17/30] media: rtl28xxu: fix zero-length control request [4.9,18/30] pipe: increase minimum default pipe size to 2 pages [4.9,19/30] serial: 8250: Mask out floating 16/32-bit bus bits [4.9,20/30] MIPS: Malta: Do not byte-swap accesses to the CBUS UART [4.9,21/30] pcmcia: i82092: fix a null pointer dereference bug [4.9,22/30] perf/x86/amd: Dont touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest [4.9,23/30] reiserfs: add check for root_inode in reiserfs_fill_super [4.9,24/30] reiserfs: check directory items on read from disk [4.9,25/30] alpha: Send stop IPI to send to online CPUs [4.9,26/30] net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset [4.9,27/30] USB:ehci:fix Kunpeng920 ehci hardware problem [4.9,28/30] ppp: Fix generating ppp unit id when ifname is not specified [4.9,29/30] net: xilinx_emaclite: Do not print real IOMEM pointer [4.9,30/30] ovl: prevent private clone if bind mount is not allowed

Commit Message

Greg KH Aug. 13, 2021, 3:06 p.m. UTC

From: Dan Carpenter <dan.carpenter@oracle.com>

[ Upstream commit fb653827c758725b149b5c924a5eb50ab4812750 ]

Set the error code if bnx2x_alloc_fw_stats_mem() fails.  The current
code returns success.

Fixes: ad5afc89365e ("bnx2x: Separate VF and PF logic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 46a7dcf2ff4a..9d7f491931ce 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2672,7 +2672,8 @@  int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 	}
 
 	/* Allocated memory for FW statistics  */
-	if (bnx2x_alloc_fw_stats_mem(bp))
+	rc = bnx2x_alloc_fw_stats_mem(bp);
+	if (rc)
 		LOAD_ERROR_EXIT(bp, load_error0);
 
 	/* request pf to initialize status blocks */