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 75788C49EA5 for ; Mon, 21 Jun 2021 18:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61D1E60C41 for ; Mon, 21 Jun 2021 18:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233853AbhFUSCS (ORCPT ); Mon, 21 Jun 2021 14:02:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:39638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232421AbhFUSAJ (ORCPT ); Mon, 21 Jun 2021 14:00:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BCBB86135F; Mon, 21 Jun 2021 17:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298074; bh=YAosHF3Rn+pwh74fREtC5yfVmUax3lUyt06GeiSpjC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QpPugWkGn5mNZS3kWs6beqlhj97/Cy0sw8DSYo3mABcoiKx/jE8PqmC6NYgRTVohu RsUl5vnD3iNXaICKaefI8pc5sfspIFUUzUTqXJ3uWof60QWw380Vpei3Mj0gof7zyb YpuxwT7u0KyDR8K+x8GF3UllCbPr3hDY7wmeMFUmAFf+ZwCkS+pqhDQyZQ0T7Zr1vn 925KfH9h4KgRu5pHrwCvQ4UUyDK4WpwYpxhb9L28EEpDxJb/IQrve70qEGAstTkPF6 R0A+UESnWzeYbFnCV5FCyXaeQs6R79yfF8OUiae89y0kondFy6WVXSG4sU7eXRiKkn 3HkffzQoqLCzA== 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, linux-renesas-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 19/26] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:53:52 -0400 Message-Id: <20210621175400.735800-19-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621175400.735800-1-sashal@kernel.org> References: <20210621175400.735800-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: netdev@vger.kernel.org From: Kees Cook [ Upstream commit 224004fbb033600715dbd626bceec10bfd9c58bc ] 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/renesas/sh_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index a042f4607b0d..931a44fe7afe 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2322,7 +2322,7 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data) { switch (stringset) { case ETH_SS_STATS: - memcpy(data, *sh_eth_gstrings_stats, + memcpy(data, sh_eth_gstrings_stats, sizeof(sh_eth_gstrings_stats)); break; } -- 2.30.2