From patchwork Fri Mar 2 00:25:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 880193 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gWTQg3Qn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zsqq325P4z9s7C for ; Fri, 2 Mar 2018 11:26:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163824AbeCBAZm (ORCPT ); Thu, 1 Mar 2018 19:25:42 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:40535 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163666AbeCBAZk (ORCPT ); Thu, 1 Mar 2018 19:25:40 -0500 Received: by mail-qk0-f194.google.com with SMTP id o25so9997399qkl.7; Thu, 01 Mar 2018 16:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l+Vw8XQ0PzP6b2s4Ulm05PIJ9pE1Aj00uk00ETAj2Fk=; b=gWTQg3Qn1Cxk1kMep2NhcIpOIzoFV2IhBF8ZQkHZT+mo4LcOlD7liHzC5cNjlZPzvz mEOd1SQZj/OvJLyl8uL79JnjT+56TFsYw8aC+iZqow3ipgdIqBP/3C4HVAS3ZBScla+v K9GOEUW5qgIylSucDyxpqmT5MQmqH8jgJ+TUjMiThaqHVyAzafI77z5DIzVFtYyWc0dU sdb3qIbaGQygkMv6M7ECXTzP/uJGc/E85CRlulagG48Kc1U15GokA4aEr8Pcsn6Mkicf dt/jNxfK9MvTgwP1VL9PZANyzSGyJIddNNT9J+uT0lPtyw3FYCSvYlR3RvwJL4F0otFw mrEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l+Vw8XQ0PzP6b2s4Ulm05PIJ9pE1Aj00uk00ETAj2Fk=; b=FAFRE0Q6ZEAmEPOI61i/igBTK1uNbNnb/GHLzaWV4B7GZQhWS+vPITUMgT6iiKhGu7 U46+xnMpO71IzDBV+D835DmkslUr3QGXGPK4xVGWdzfJ5iA0thQIFUaETVU5W68F8lsJ 6pjzzmqdZcCM8zAosKEESTdtKUe4FHtbZ3/45Jbef1hQJPd7n/0zPb7U8+bVx28hUQO9 aka+PbVBjOX3SqgXyEbvB8h/1Ck/C5BVjbBClP53NyleQCrtNByeLBxTTl3gAgISbn0H C1R6lMvo2Nv1fntnQkFUZ+v+yEe1M4sTP2WvZ+jELSunJMqRD/jp5cpLtyEtvryHevIk xIwg== X-Gm-Message-State: AElRT7EKaK6lGxqwaLKWYO1hgPPU26Mv2QLMU9s/COedUC4pBt3jfzxS lVE+N0mhTZK0aBXAQONMmNYy4y+q X-Google-Smtp-Source: AG47ELthHCi0WcTWnMaLndQPw2DrfnKPgo9Gu09NJ3B4j5R9pxVu453tFi0aPpcCFZOQs/ICG5BdCQ== X-Received: by 10.55.214.138 with SMTP id p10mr5766036qkl.188.1519950339570; Thu, 01 Mar 2018 16:25:39 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id e9sm3611231qkj.65.2018.03.01.16.25.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 16:25:38 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , Woojung Huh , Microchip Linux Driver Support , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net 2/4] net: dsa: loop: Use strncpy() for ethtool::get_strings Date: Thu, 1 Mar 2018 16:25:27 -0800 Message-Id: <20180302002529.15226-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180302002529.15226-1-f.fainelli@gmail.com> References: <20180302002529.15226-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not use memcpy() which is not safe, but instead use strncpy() which will make sure that the string is NUL terminated (in the Linux implementation) if the string is smaller than the length specified. This fixes KASAN out of bounds warnings while fetching port statistics. Fixes: 484c01720d84 ("net: dsa: loop: Implement ethtool statistics") Signed-off-by: Florian Fainelli --- drivers/net/dsa/dsa_loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index 7aa84ee4e771..2e7e1cdbd2e9 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -97,8 +97,8 @@ static void dsa_loop_get_strings(struct dsa_switch *ds, int port, uint8_t *data) unsigned int i; for (i = 0; i < __DSA_LOOP_CNT_MAX; i++) - memcpy(data + i * ETH_GSTRING_LEN, - ps->ports[port].mib[i].name, ETH_GSTRING_LEN); + strncpy(data + i * ETH_GSTRING_LEN, + ps->ports[port].mib[i].name, ETH_GSTRING_LEN); } static void dsa_loop_get_ethtool_stats(struct dsa_switch *ds, int port,