summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShai Malin <smalin@marvell.com>2021-08-24 19:52:49 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-08 08:49:00 +0200
commit0e74bba60452150016864095b4896cd6d6cd2af9 (patch)
tree087f55b314e0bdf4a635633e6a4ee1401011a022
parent35f223cb21b1cb75175e736cb5b1b2615ae6d342 (diff)
downloadlinux-stable-0e74bba60452150016864095b4896cd6d6cd2af9.tar.gz
linux-stable-0e74bba60452150016864095b4896cd6d6cd2af9.tar.bz2
linux-stable-0e74bba60452150016864095b4896cd6d6cd2af9.zip
qede: Fix memset corruption
[ 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>
-rw-r--r--drivers/net/ethernet/qlogic/qede/qede_main.c2
1 files changed, 1 insertions, 1 deletions
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: