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 A83A5C4743C for ; Mon, 21 Jun 2021 18:09:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86BB160698 for ; Mon, 21 Jun 2021 18:09:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231802AbhFUSMD (ORCPT ); Mon, 21 Jun 2021 14:12:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:45242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234318AbhFUSFF (ORCPT ); Mon, 21 Jun 2021 14:05:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 430466141F; Mon, 21 Jun 2021 17:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298179; bh=QR7oTvSOD4g+P2aR/hFUhfVBo6A/oBvDfcmz4ZeQt3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RD8WaF+JHGSrTYQr6fUAHfwSN0EHqZJ8zRog9e4MnZjwsOrvDoCNBlAWxK1eHtaA7 ZLXERKTPEq4RmBhGwdVcnRxk7I7f0fadDDLU9thnbJ+0gdVOoLjB2MXfLAf028K0sy nnjpMUqAbauIOnc0B1FnpXHVmtO3DoyUx5Piy0Pj4t3fmA+Xro/KrC7hbUPZwYuza2 31VAjtXnAR1pGoCkEZQEMuv2fq/vbei9rX5VrJTIMxmy7ZGbxjF2Gi+ehhkjQTf7fF 4pHbCcxpvOTVpoDUroFBfJogW4IsAIfLaySv91A8aGsOoP4+oCesGMxICMJ7T+QECc kbItJ9rzuqXpQ== 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 4.4 8/9] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:56:06 -0400 Message-Id: <20210621175608.736581-8-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175608.736581-1-sashal@kernel.org> References: <20210621175608.736581-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.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index f3a685d3f649..55b0f11bf2a0 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2314,7 +2314,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