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 677CEC4320E for ; Mon, 30 Aug 2021 12:05:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 51F146103C for ; Mon, 30 Aug 2021 12:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237485AbhH3MGb (ORCPT ); Mon, 30 Aug 2021 08:06:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:47764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236747AbhH3MBD (ORCPT ); Mon, 30 Aug 2021 08:01:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1BE16115C; Mon, 30 Aug 2021 12:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630324809; bh=0Q8EKeXxkYgT94UKm7lT9utLHVkGRoZMzD9jbo+cAPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aZKQaVOeNYURrmBdfEB3qdlZoMcXJFAKeVvpVsDNbmucIsEFdsfc87HfAyQyE4yX0 KXtKfyraOj+Dmt6uAPYlpPhPRK6R6u8q/0XeDqMaLixNXdGDJo/EQqrw3cIq9ct7Bb x1LQUKrQ/f2lOaWcWxyZKxDUl8dXJuk0bfon7Ks9OVWuxiJ3uKcfSfImAN2IK4Hf0N 6T9iDF5cJFJsN7RAQ9YHvxmy64zPXOB1+0HWrJzExRLnpNT69KVm8pZK6ELKTCptjW kvsjnSKKpYd9xPBHIFcoFIb0Hf8f6SyFM3CMyyMxnuruCavjfGUhJTyS0woeDrKvDb LFiTY4jqgSDhg== 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 5.10 05/11] qede: Fix memset corruption Date: Mon, 30 Aug 2021 07:59:56 -0400 Message-Id: <20210830120002.1017700-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210830120002.1017700-1-sashal@kernel.org> References: <20210830120002.1017700-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 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: -- 2.30.2