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 88FD8C49EA2 for ; Mon, 21 Jun 2021 18:00:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C20C61040 for ; Mon, 21 Jun 2021 18:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231910AbhFUSCQ (ORCPT ); Mon, 21 Jun 2021 14:02:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:39622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232947AbhFUSAI (ORCPT ); Mon, 21 Jun 2021 14:00:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EB564613D5; Mon, 21 Jun 2021 17:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298072; bh=6DnWgGcJxdSYdGsEZMZ0kDzjERj0+WXcC5vnghvr9TU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k/eFEVs1i0rY9QgHwnqY6a1Gq+YWaKp4vrs+pAjuVmsIgOJIwfGOECcJ2KGzGGW2Q H6u48B8pRw5gENbimcyVuqcB030/Eyo3hBESgvYV6jdIcqhw+mZPSEgtCHCpAfHJoH OJFmYd4jOgxREkr5EJcCAS9o9xodRXFUtaWkJ9p5ungDbTNN2mPvXe9+huhrL7Zf4A 82OR51RYtjxCnF/+wWFJS+dEzCAlYyF71APla3bjGrf6lfao0En+VWHK7g3d2oCY0e MyhLvDkKnqy4qpcPV+MJBF2U9S1v6j7Nbge2USWi5TDc2noqd+aNekChgidDjl14o7 SxmbwFpKhyA0A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , "David S . Miller" , Sasha Levin , linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 18/26] r8152: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:53:51 -0400 Message-Id: <20210621175400.735800-18-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 99718abdc00e86e4f286dd836408e2834886c16e ] 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/usb/r8152.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index f6d643ecaf39..24d124633037 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5065,7 +5065,7 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) { switch (stringset) { case ETH_SS_STATS: - memcpy(data, *rtl8152_gstrings, sizeof(rtl8152_gstrings)); + memcpy(data, rtl8152_gstrings, sizeof(rtl8152_gstrings)); break; } } -- 2.30.2