From patchwork Fri Feb 2 15:44:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 126738 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp756340ljc; Fri, 2 Feb 2018 07:45:29 -0800 (PST) X-Google-Smtp-Source: AH8x224BLINPswjKbCdH3LhhZHZc0MtF0MsDy5ttBXfZyUKoEnH9wT/lu6ETJN4dMcdfPJXAbfbK X-Received: by 2002:a17:902:48c8:: with SMTP id u8-v6mr34501002plh.272.1517586329276; Fri, 02 Feb 2018 07:45:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517586329; cv=none; d=google.com; s=arc-20160816; b=yxrK/QyFnwqYYonLueE7zw4cCNB9Y0TB6YL2CH8mryUKFr7X0QYhGsZbN6kk1vyqWV NJUEBspaVzHC4YCIPry25GAQefrU3nu28hq/kvOm7+YrBNiGu+O357/XtItpF/tkUrv8 Nk30LNLX+XfA/lde8pvSBF3Bjb3J5+ucmi+sUTXUMOens6i7fvojqHgEvAfPRreaWo9k 3QVYre7Ot9prD2v4gv2siKQo/23hIv3pb1aR7RGS4pNd+33+rmKx8XwiTa9V3WMV7Rjp bLEjwNFHet7ab+NpTFY9wFT3yxNNUAHTb6pr20IN93v4Avd05YxKUXVNJuhtDSnv6asF 2m+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=MMYPPwXnAZeQujPZR+f81o0H/MfHaDhlDJCSbiVFwVA=; b=WSinn+wZNGmFd8F4PRa1L8+LDEFp7xIAhqp0X+vBiytCT91uAERPMu5jEwWec5gEZp Hf9ucTgDufXQScMfgQvXOcNU+K/dHweqXFkns1dObmGESnwXehCvAq8dCZ+dqQiZW2eo dRYYzHOCiyxEAn0WW1TBPw0cYmWtTIKREdanIc1beXpjxnFv1BvuYzpgcNrYpU11zcy0 T5n3W3LnPZjQq0OgBlQB00D35kB5evHAgL0lzjRSIHkLR7Lh9eLh9xsb8CwPEFyJAwfq EpkBkWcG/i6Ofb/RM1f0EnFdW8caKrAXSm4CFzMOobpObvMFm4mVRKI5jZMTjn9mqsJc a4fg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12-v6si1992263pln.737.2018.02.02.07.45.28; Fri, 02 Feb 2018 07:45:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbeBBPpZ (ORCPT + 28 others); Fri, 2 Feb 2018 10:45:25 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:54813 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbeBBPpP (ORCPT ); Fri, 2 Feb 2018 10:45:15 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0LcK74-1f7NLl19dO-00jrcR; Fri, 02 Feb 2018 16:45:03 +0100 From: Arnd Bergmann To: Ariel Elior , everest-linux-l2@cavium.com Cc: Arnd Bergmann , "David S. Miller" , Tomer Tayar , "Mintz, Yuval" , Chad Dupuis , Manish Rangankar , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: qed: use correct strncpy() size Date: Fri, 2 Feb 2018 16:44:47 +0100 Message-Id: <20180202154500.1616404-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:NkfWICbPC/pJdeAkB3eE3KxqSALmeTBcrC3RidHPT2tcyk5ufv6 hK53B8E0h8qiE9/tpYlek6VYNoqku41lN6HtM+G+E3sPODN8fqF79jQmJGzoas58Yw45Lw/ uj4R4gF0BxEg1XQfkzjZQoa8/OZ5faKCDqKqxEFRXUIZuGsfyMc+uK1PKab8LyOckIpxanF LE69cZOrYrWX7CqF7F3eA== X-UI-Out-Filterresults: notjunk:1; V01:K0:6n7e43UWz3U=:Jc7tQrEvSZ/ch5qtz2HLHG +IiTxGwNMEqjeuQkaxyef0nSexHm86zObrm1vGcpabioI0fNyOY2gZaxNtzfNsh4vrdOuto+o IDNYuCTOYDc39WJxs4TU0xxljnE32Ll5QIzVNCGZqbXvH5UcBJvz7yk0dLwWDyi+4W5QMkLOn UARBvNy8k/t4aVLumjMJIUDq04wLB7+icigUL4MXomAU9oLhc+wVlkBPBbBx6pQfsFivcci5M Z9rqzp5LbTQ16HjrLBq7COdcDlSITJy8b5ETaRLeOXF+LS0tCQjFVKVhpUVyFAk9mEhm1hnJt aBdirjkISB6C3mnK7BZnzfSLb232m3of0sI5VMO+znf+KCdj4v72qKfxyf7NojTwTcu6O1zg+ TBqdgFW3gcOrmuT2EGLN/UvBFDEyZsKgy7z+JJYQvZI6XbItwigA5CGpC9owDA76oAiEEvC3R D5u92QOQKdBPtcC+elcMU3JYap/jSPHe5kOvZ6UyP27soV62G3pniRgcUrKE3X9cOHiyfnB0Y hZw1/JpfgNPM/lJQ0iEzzNyEsV4QN9TDvvfTlXHy9HmlPL+7+K4uhwwT0y/8tHLJxaEakifOi o7crZi6dozrKYDsG9DoTqSLHTY5Ak3dibdG1IGTAM5j3K2ZK4cmIG/k2QpLqQZtL11fmynzPP jKqMXMGk7Ydq426lp1XGxUsJr+N/KEHoDQxQvBKOQeEmex15bgu2EDUSXMdUBKm2t6IgjHsB/ WTAE8kP24jReu79b0+FRqrCgvPYZxUnXR8q5Xw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org passing the strlen() of the source string as the destination length is pointless, and gcc-8 now warns about it: drivers/net/ethernet/qlogic/qed/qed_debug.c: In function 'qed_grc_dump': include/linux/string.h:253: error: 'strncpy' specified bound depends on the length of the source argument [-Werror=stringop-overflow=] This changes qed_grc_dump_big_ram() to instead uses the length of the destination buffer, and use strscpy() to guarantee nul-termination. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/qlogic/qed/qed_debug.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c index f2633ec87a6a..fdf37abee3d3 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_debug.c +++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c @@ -3649,10 +3649,8 @@ static u32 qed_grc_dump_big_ram(struct qed_hwfn *p_hwfn, BIT(big_ram->is_256b_bit_offset[dev_data->chip_id]) ? 256 : 128; - strncpy(type_name, big_ram->instance_name, - strlen(big_ram->instance_name)); - strncpy(mem_name, big_ram->instance_name, - strlen(big_ram->instance_name)); + strscpy(type_name, big_ram->instance_name, sizeof(type_name)); + strscpy(mem_name, big_ram->instance_name, sizeof(mem_name)); /* Dump memory header */ offset += qed_grc_dump_mem_hdr(p_hwfn,