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,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 579EEC4743C for ; Mon, 21 Jun 2021 17:58:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4556F61026 for ; Mon, 21 Jun 2021 17:58:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233336AbhFUSA1 (ORCPT ); Mon, 21 Jun 2021 14:00:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:39048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232017AbhFUR6E (ORCPT ); Mon, 21 Jun 2021 13:58:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8441D613C8; Mon, 21 Jun 2021 17:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298022; bh=iU6xzPa6JQVBHnxsg6oN/Htpg2TH7DcVkVfnLQl7mLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EXFW0yRDee68sB++OFgNc6a7ej4lcMiqwRZrTJ3+syu7G5FxQWE2fzlKW27DPNq5g nH26vpUz3ucqIxlR558x55D9E0fHnXC/tPpEZrZ5yAKPjAtUcr00XGGPo+Ny/d6Xi6 xyFqu47U2GRU1JLQ+V+p/fMDTVICQiiV7DEvgGego3xzgwnqbfEL1ZH/YB8n/ogkre goXl1qCoKry1Amja8KkJvfql3iXX6ZeMkVA2LwC9F3pa4XLgbnn2RJCLFcY/oLNQVz pXcxUbtJHsMKA3gsmxbAROMV/ty98cRW/urcKO96GO0t/QX8irEM7oJdZ940/N2RYd 8ZKWNMY3nRzXQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 27/35] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:52:52 -0400 Message-Id: <20210621175300.735437-27-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175300.735437-1-sashal@kernel.org> References: <20210621175300.735437-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: Kees Cook [ Upstream commit da5ac772cfe2a03058b0accfac03fad60c46c24d ] In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memcpy(), memmove(), and memset(), avoid intentionally reading across neighboring array fields. The memcpy() is copying the entire structure, not just the first array. Adjust the source argument so the compiler can do appropriate bounds checking. Signed-off-by: Kees Cook Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 3bb36f4a984e..a6bf80b52967 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1673,7 +1673,7 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data) { switch(stringset) { case ETH_SS_STATS: - memcpy(data, *rtl8169_gstrings, sizeof(rtl8169_gstrings)); + memcpy(data, rtl8169_gstrings, sizeof(rtl8169_gstrings)); break; } } -- 2.30.2