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 03C8BC4743C for ; Mon, 21 Jun 2021 18:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1C2B61245 for ; Mon, 21 Jun 2021 18:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232405AbhFUSIL (ORCPT ); Mon, 21 Jun 2021 14:08:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:47232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234314AbhFUSFF (ORCPT ); Mon, 21 Jun 2021 14:05:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF52B6141B; Mon, 21 Jun 2021 17:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624298177; bh=CpiTn6fwGgaGXTMYGMgfNW+cWjoAaiD92xplXobmz54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q6C3TgXlNZRmeMJudTkanx6Lyypd8xShfOwHigjbEHp/XBZIB0Bgxuno6rpBObk60 SjhSPjiXUtlOOzXqxRzJOK3ddR+vYXgmG4LeGgKSftFy/qgU+8eCsQpUTwsw6HUmBg WmzEqp2YVnYgmOipn8SH1NZIBjWB+nuzMxh4KfM5VmvwPAN5ckw5ElJvW0THUQb6w1 oRtEe2Pw5DB/lwvmgW0ovwDiZwZwfDhbWJNGduqGIiHoj9euq86E2nbsOZiLBmdzWq YIdjBW2PTLrswjb3giwcMVNux4seQYAr/ic+WOYOotJ3crZjn+XSQFrv2QY1ukxIz7 LkFMhmAYN0GtA== 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 4.4 6/9] r8152: Avoid memcpy() over-reading of ETH_SS_STATS Date: Mon, 21 Jun 2021 13:56:04 -0400 Message-Id: <20210621175608.736581-6-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: 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 27e9c089b2fc..5baaa8291624 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3820,7 +3820,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