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 DBDB6C4743C for ; Mon, 21 Jun 2021 18:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C509061026 for ; Mon, 21 Jun 2021 18:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232740AbhFUSIu (ORCPT ); Mon, 21 Jun 2021 14:08:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:46240 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234028AbhFUSEb (ORCPT ); Mon, 21 Jun 2021 14:04:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 956CF6141A; Mon, 21 Jun 2021 17:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298162; bh=d0rFUGv2OW/1L4HfxFYIgaqp8z7UuTp8MhH/e3F0Ww4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BfdI/aP+TL9YwrHQKQ0IxyAiA1hmEvZZCHYDwzEog8x5lbKYKEQBPe6tAcmH9fTJk BjOnXJnjydkRzZLvqerK6j2F+Kg74w8DlY1zHuTRSUGJb4jV6lUjBtDmcwNSo7lw/7 dxOlBw68yztCV+AuwQPIfuAT7mTXdR5WhWytFe5MC8qUuaKw/gC6+LCgFEGiN+iM77 s8eYtcnfmqgbVWWcSj0xOeKvNw1wRBB99HtxFmtXjwTHKs0VGPjc7ssVzRmxyxrjoH IGEmWpEeEiW3/bVqttf76r5EI4SdBQadDwtzdSemvEyRunXX7HepDWJmPqSoKpspob MGRPa1hWHZt+g== 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.9 11/13] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:55:41 -0400 Message-Id: <20210621175544.736421-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175544.736421-1-sashal@kernel.org> References: <20210621175544.736421-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 3521e3a77556..f321b115719a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2338,7 +2338,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