From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31EF1C432BE for ; Mon, 30 Aug 2021 12:01:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C42260E77 for ; Mon, 30 Aug 2021 12:01:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237172AbhH3MCV (ORCPT ); Mon, 30 Aug 2021 08:02:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:50136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236962AbhH3MBl (ORCPT ); Mon, 30 Aug 2021 08:01:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06AF26115A; Mon, 30 Aug 2021 12:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630324848; bh=ddNa6ZUUwvpp1+I59j76O+1Y1sXYVdpyxv7gmFqsBVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXdmvTK+Ff7TXKVP0owCS/588YQnwZbw59JaNZv8AEd3k1yc8CIKGoljQzSlvmSUP EB+j5aH30gwfDSPP5g/PnU1DhJdBVgRDdQ3WrmFM//P8qJW/VdTB+IiZYWGQSg60GL d9xRoGMJ4Yw8l88lRRkQE6xd3G77QSOEtTtYm+0vOafqkjFyr6+60WDz2gwPKMb902 /RaesC8eeN7dajhobTqsEBZtaKg2iJy9qgJzqzAMwnWLDaLX275Y/lUn1nSVRJmS6Y /5rUF6K3U3yBGJwGQxwLVHHACn53FGEmXLZy0FnhLPeGZcvVL9Fb6Si+sOTVaE8quD LNzoQOKohbIDQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shai Malin , Prabhakar Kushwaha , Ariel Elior , Kees Cook , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 3/7] qede: Fix memset corruption Date: Mon, 30 Aug 2021 08:00:39 -0400 Message-Id: <20210830120043.1018096-3-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210830120043.1018096-1-sashal@kernel.org> References: <20210830120043.1018096-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shai Malin [ 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 Signed-off-by: Ariel Elior Signed-off-by: Shai Malin Reported-by: Kees Cook Reviewed-by: Kees Cook Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 8bb734486bf3..99de923728ec 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -1590,6 +1590,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) @@ -2088,7 +2089,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: -- 2.30.2