diff mbox series

[5.10,16/29] qede: Fix memset corruption

Message ID	20210906125450.325804754@linuxfoundation.org
State	New
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, Prabhakar Kushwaha <pkushwaha@marvell.com>, Ariel Elior <aelior@marvell.com>, Shai Malin <smalin@marvell.com>, Kees Cook <keescook@chromium.org>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 16/29] qede: Fix memset corruption Date: Mon, 6 Sep 2021 14:55:31 +0200 Message-Id: <20210906125450.325804754@linuxfoundation.org> In-Reply-To: <20210906125449.756437409@linuxfoundation.org> References: <20210906125449.756437409@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.10,02/29] fscrypt: add fscrypt_symlink_getattr() for computing st_size [5.10,03/29] ext4: report correct st_size for encrypted symlinks [5.10,04/29] f2fs: report correct st_size for encrypted symlinks [5.10,05/29] ubifs: report correct st_size for encrypted symlinks [5.10,06/29] Revert "ucounts: Increase ucounts reference counter before the security hook" [5.10,07/29] Revert "cred: add missing return error code when set_cred_ucounts() failed" [5.10,08/29] Revert "Add a reference to ucounts for each cred" [5.10,09/29] static_call: Fix unused variable warn w/o MODULE [5.10,10/29] xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG [5.10,11/29] ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power [5.10,12/29] gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats [5.10,13/29] reset: reset-zynqmp: Fixed the argument data type [5.10,14/29] qed: Fix the VF msix vectors flow [5.10,15/29] net: macb: Add a NULL check on desc_ptp [5.10,16/29] qede: Fix memset corruption [5.10,17/29] perf/x86/intel/pt: Fix mask of num_address_ranges [5.10,18/29] ceph: fix possible null-pointer dereference in ceph_mdsmap_decode() [5.10,19/29] perf/x86/amd/ibs: Work around erratum #1197 [5.10,20/29] perf/x86/amd/power: Assign pmu.module [5.10,21/29] cryptoloop: add a deprecation warning [5.10,22/29] ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup [5.10,23/29] ALSA: hda/realtek: Workaround for conflicting SSID on ASUS ROG Strix G17 [5.10,24/29] ALSA: pcm: fix divide error in snd_pcm_lib_ioctl [5.10,25/29] serial: 8250: 8250_omap: Fix possible array out of bounds access [5.10,26/29] spi: Switch to signed types for *_native_cs SPI controller fields [5.10,27/29] new helper: inode_wrong_type() [5.10,28/29] fuse: fix illegal access to inode with reused nodeid [5.10,29/29] media: stkwebcam: fix memory leak in stk_camera_probe

Commit Message

Greg KH Sept. 6, 2021, 12:55 p.m. UTC

From: Shai Malin <smalin@marvell.com>

[ Upstream commit e543468869e2532f5d7926e8f417782b48eca3dc ]

Thanks to Kees Cook who detected the problem of memset that starting
from not the first member, but sized for the whole struct.
The better change will be to remove the redundant memset and to clear
only the msix_cnt member.

Signed-off-by: Prabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Shai Malin <smalin@marvell.com>
Reported-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index d9a3c811ac8b..e93f06e4a172 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -1869,6 +1869,7 @@  static void qede_sync_free_irqs(struct qede_dev *edev)
 	}
 
 	edev->int_info.used_cnt = 0;
+	edev->int_info.msix_cnt = 0;
 }
 
 static int qede_req_msix_irqs(struct qede_dev *edev)
@@ -2409,7 +2410,6 @@  static int qede_load(struct qede_dev *edev, enum qede_load_mode mode,
 	goto out;
 err4:
 	qede_sync_free_irqs(edev);
-	memset(&edev->int_info.msix_cnt, 0, sizeof(struct qed_int_info));
 err3:
 	qede_napi_disable_remove(edev);
 err2: