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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 DFE98C468BD for ; Sun, 9 Jun 2019 17:21:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0A8420652 for ; Sun, 9 Jun 2019 17:21:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100907; bh=anG7b5l8TUD3kc7RKq39S5Thv10tZu2qz38hQsN+Xyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bZpArdGcOwIubWI1lrxR8YFDGcNabcaxrT6pqtZ6N+OEtDNDo+0UFur9mqPXaLiwy 3Q4ay/lLxkE9bZZLd4CrVTeNtl2Qquah8v6mgFuFvLjt7EIVakXH6wxnK55vKx6HYb kf1YYCsdE6NJ7RmzeJwNGLGLbHKVHFcjuOniexD4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729887AbfFIQpa (ORCPT ); Sun, 9 Jun 2019 12:45:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:43192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729831AbfFIQpZ (ORCPT ); Sun, 9 Jun 2019 12:45:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E46FA2081C; Sun, 9 Jun 2019 16:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098725; bh=anG7b5l8TUD3kc7RKq39S5Thv10tZu2qz38hQsN+Xyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q4+URRzdRt/NTI1+au331yjx72PgeAAjQvoGX8sdMj9bKq41JUbhz/JtVk4QuWL86 W49q2IEUG9Q7AliNqpcswfqlQHVu0OQONLCobTpfHGWrWWA1skTv/hoJ9zcq/foGRx 0kVB4ntHHvPLq/az/5NCY/DsVZw8osM0XoMh1lmA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Chevallier , "David S. Miller" Subject: [PATCH 5.1 06/70] net: mvpp2: Use strscpy to handle stat strings Date: Sun, 9 Jun 2019 18:41:17 +0200 Message-Id: <20190609164127.850991830@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.541128197@linuxfoundation.org> References: <20190609164127.541128197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maxime Chevallier [ Upstream commit d37acd5aa99c57505b64913e0e2624ec3daed8c5 ] Use a safe strscpy call to copy the ethtool stat strings into the relevant buffers, instead of a memcpy that will be accessing out-of-bound data. Fixes: 118d6298f6f0 ("net: mvpp2: add ethtool GOP statistics") Signed-off-by: Maxime Chevallier Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -1304,8 +1304,8 @@ static void mvpp2_ethtool_get_strings(st int i; for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_regs); i++) - memcpy(data + i * ETH_GSTRING_LEN, - &mvpp2_ethtool_regs[i].string, ETH_GSTRING_LEN); + strscpy(data + i * ETH_GSTRING_LEN, + mvpp2_ethtool_regs[i].string, ETH_GSTRING_LEN); } }