diff mbox series

[5.4,30/85] bnx2x: fix an error code in bnx2x_nic_load()

Message ID	20210810172949.222683470@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 5.4 30/85] bnx2x: fix an error code in bnx2x_nic_load() Date: Tue, 10 Aug 2021 19:30:03 +0200 Message-Id: <20210810172949.222683470@linuxfoundation.org> In-Reply-To: <20210810172948.192298392@linuxfoundation.org> References: <20210810172948.192298392@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 [5.4,02/85] ALSA: seq: Fix racy deletion of subscriber [5.4,03/85] arm64: dts: ls1028a: fix node name for the sysclk [5.4,04/85] ARM: imx: add missing iounmap() [5.4,05/85] ARM: imx: add missing clk_disable_unprepare() [5.4,06/85] ARM: dts: imx6qdl-sr-som: Increase the PHY reset duration to 10ms [5.4,07/85] ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz [5.4,08/85] ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init [5.4,09/85] ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins [5.4,10/85] arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode [5.4,11/85] ALSA: usb-audio: fix incorrect clock source setting [5.4,12/85] clk: stm32f4: fix post divisor setup for I2S/SAI PLLs [5.4,13/85] ARM: dts: am437x-l4: fix typo in can@0 node [5.4,14/85] omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator [5.4,15/85] spi: imx: mx51-ecspi: Reinstate low-speed CONFIGREG delay [5.4,16/85] spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation [5.4,17/85] scsi: sr: Return correct event when media event code is 3 [5.4,18/85] media: videobuf2-core: dequeue if start_streaming fails [5.4,19/85] dmaengine: imx-dma: configure the generic DMA type to make it work [5.4,20/85] net, gro: Set inner transport header offset in tcp/udp GRO hook [5.4,21/85] net: dsa: sja1105: overwrite dynamic FDB entries with static ones in .port_fdb_add [5.4,22/85] net: dsa: sja1105: invalidate dynamic FDB entries learned concurrently with staticall... [5.4,23/85] net: phy: micrel: Fix detection of ksz87xx switch [5.4,24/85] net: natsemi: Fix missing pci_disable_device() in probe and remove [5.4,25/85] gpio: tqmx86: really make IRQ optional [5.4,26/85] sctp: move the active_key update after sh_keys is added [5.4,27/85] nfp: update ethtool reporting of pauseframe control [5.4,28/85] net: ipv6: fix returned variable type in ip6_skb_dst_mtu [5.4,29/85] mips: Fix non-POSIX regexp [5.4,30/85] bnx2x: fix an error code in bnx2x_nic_load() [5.4,31/85] net: pegasus: fix uninit-value in get_interrupt_interval [5.4,32/85] net: fec: fix use-after-free in fec_drv_remove [5.4,33/85] net: vxge: fix use-after-free in vxge_device_unregister [5.4,34/85] blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit() [5.4,35/85] Bluetooth: defer cleanup of resources in hci_unregister_dev() [5.4,36/85] USB: usbtmc: Fix RCU stall warning [5.4,37/85] USB: serial: option: add Telit FD980 composition 0x1056 [5.4,38/85] USB: serial: ch341: fix character loss at high transfer rates [5.4,39/85] USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2 [5.4,40/85] firmware_loader: use -ETIMEDOUT instead of -EAGAIN in fw_load_sysfs_fallback [5.4,41/85] firmware_loader: fix use-after-free in firmware_fallback_sysfs [5.4,42/85] ALSA: hda/realtek: add mic quirk for Acer SF314-42 [5.4,43/85] ALSA: usb-audio: Add registration quirk for JBL Quantum 600 [5.4,44/85] usb: cdns3: Fixed incorrect gadget state [5.4,45/85] usb: gadget: f_hid: added GET_IDLE and SET_IDLE handlers [5.4,46/85] usb: gadget: f_hid: fixed NULL pointer dereference [5.4,47/85] usb: gadget: f_hid: idle uses the highest byte for duration [5.4,48/85] usb: otg-fsm: Fix hrtimer list corruption [5.4,49/85] clk: fix leak on devm_clk_bulk_get_all() unwind [5.4,50/85] scripts/tracing: fix the bug that cant parse raw_trace_func [5.4,51/85] tracing / histogram: Give calculation hist_fields a size [5.4,52/85] optee: Clear stale cache entries during initialization [5.4,53/85] tee: add tee_shm_alloc_kernel_buf() [5.4,54/85] optee: Fix memory leak when failing to register shm pages [5.4,55/85] tpm_ftpm_tee: Free and unregister TEE shared memory during kexec [5.4,56/85] staging: rtl8723bs: Fix a resource leak in sd_int_dpc [5.4,57/85] staging: rtl8712: get rid of flush_scheduled_work [5.4,58/85] media: rtl28xxu: fix zero-length control request [5.4,59/85] pipe: increase minimum default pipe size to 2 pages [5.4,60/85] ext4: fix potential htree corruption when growing large_dir directories [5.4,61/85] serial: tegra: Only print FIFO error message when an error occurs [5.4,62/85] serial: 8250_mtk: fix uart corruption issue when rx power off [5.4,63/85] serial: 8250: Mask out floating 16/32-bit bus bits [5.4,64/85] MIPS: Malta: Do not byte-swap accesses to the CBUS UART [5.4,65/85] serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated driver [5.4,66/85] serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts. [5.4,67/85] timers: Move clearing of base::timer_running under base:: Lock [5.4,68/85] pcmcia: i82092: fix a null pointer dereference bug [5.4,69/85] md/raid10: properly indicate failure when ending a failed write request [5.4,70/85] KVM: x86: accept userspace interrupt only if no event is injected [5.4,71/85] KVM: Do not leak memory for duplicate debugfs directories [5.4,72/85] KVM: x86/mmu: Fix per-cpu counter corruption on 32-bit builds [5.4,73/85] arm64: vdso: Avoid ISB after reading from cntvct_el0 [5.4,74/85] soc: ixp4xx: fix printing resources [5.4,75/85] spi: meson-spicc: fix memory leak in meson_spicc_remove [5.4,76/85] soc: ixp4xx/qmgr: fix invalid __iomem access [5.4,77/85] perf/x86/amd: Dont touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest [5.4,78/85] bpf, selftests: Adjust few selftest result_unpriv outcomes [5.4,79/85] libata: fix ata_pio_sector for CONFIG_HIGHMEM [5.4,80/85] reiserfs: add check for root_inode in reiserfs_fill_super [5.4,81/85] reiserfs: check directory items on read from disk [5.4,82/85] virt_wifi: fix error on connect [5.4,83/85] alpha: Send stop IPI to send to online CPUs [5.4,84/85] net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset [5.4,85/85] arm64: fix compat syscall return truncation

Commit Message

Greg Kroah-Hartman Aug. 10, 2021, 5:30 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 d10b421ed1f1..9af8afd7ae89 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -2666,7 +2666,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 */