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 22E90C4743C for ; Mon, 21 Jun 2021 17:55:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07B9161412 for ; Mon, 21 Jun 2021 17:55:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232544AbhFUR5N (ORCPT ); Mon, 21 Jun 2021 13:57:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:39620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232304AbhFURzK (ORCPT ); Mon, 21 Jun 2021 13:55:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 183FC6135A; Mon, 21 Jun 2021 17:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624297965; bh=R+x4Wqwj5RgMy8VT/r7q7vt2Ruh37Eil2G6Zb2Z7jxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QwCTcE6LNhUFHQyO28Xh5nms3hB2fNKewVd+uSfJZ/axuQjc0xTypmrNScZj2zd+X 0KJtNnXbUtxb7b71VYcPcgfLAOngjWyP2H4U2nHC0zc2lNq4pgz/qC/WDQKMtiOzyK R/k+xG3/cFjl4Hr0okk+eugQZ8qPtV1gLnn0Pl8O5ByKmE9CTf0xIAVvCKMFT3mGGP j/Hg8XQLK3tI2gJ+ItMg0mWipG6oOQc7CpptqkN/qn7TqrxqylHZmLPOV2EQvWqDoy qEV5oseWVuC9zLv1rM5EA3A/ieeFQxhPCdl4RCIxfvwJqp1yf6mhA/HBt05EVBqjNM O3yzE+ux81DRQ== 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.12 30/39] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:51:46 -0400 Message-Id: <20210621175156.735062-30-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175156.735062-1-sashal@kernel.org> References: <20210621175156.735062-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 1df2c002c9f6..f7a56e05ec8a 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