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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 287F9C2BA2B for ; Sat, 11 Apr 2020 12:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF43C20692 for ; Sat, 11 Apr 2020 12:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607265; bh=h2eGqPeixL/ya52/luORgsLdlKSXvpz5U783GSmKz9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qox8K27lenOf0wFujPSW4R+kebUrDrWmcxwyfLqvJXrYK1istHGf93mWHm7I6L75D 3BnD/YhO/us2q6NeddOGLRswmcnb6tSqs2Fu03FbpMMPRIaFFFnbizKsbvJ2M2XN9z 8GsKqRSwsuoXLnTTAVdyYIkozsBavZWQWtMbIi80= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727918AbgDKMOX (ORCPT ); Sat, 11 Apr 2020 08:14:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727916AbgDKMOV (ORCPT ); Sat, 11 Apr 2020 08:14:21 -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 BBB0920644; Sat, 11 Apr 2020 12:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586607262; bh=h2eGqPeixL/ya52/luORgsLdlKSXvpz5U783GSmKz9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kN9SxxiuU3SN9cJwZrrEFQGNLkGn2andXndK9UUGbrzjj5Duh5FdHozZBtyhdayMv sLV/an5bqrjq5TprR+cRZ/BBVtZkjHKQ3ogiRi0PsZ9NDy8btWH9u5Ru4riZCRoa7H 3Hl9RAZwXmZj3LZCWWpplvIhbQ72mYu7O7OvA5xM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Len Brown , Sasha Levin Subject: [PATCH 4.14 07/38] tools/power turbostat: Fix gcc build warnings Date: Sat, 11 Apr 2020 14:08:51 +0200 Message-Id: <20200411115438.659823721@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411115437.795556138@linuxfoundation.org> References: <20200411115437.795556138@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Len Brown [ Upstream commit d8d005ba6afa502ca37ced5782f672c4d2fc1515 ] Warning: ‘__builtin_strncpy’ specified bound 20 equals destination size [-Wstringop-truncation] reduce param to strncpy, to guarantee that a null byte is always copied into destination buffer. Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- tools/power/x86/turbostat/turbostat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 19e345cf8193e..0692f2efc25ef 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4650,9 +4650,9 @@ int add_counter(unsigned int msr_num, char *path, char *name, } msrp->msr_num = msr_num; - strncpy(msrp->name, name, NAME_BYTES); + strncpy(msrp->name, name, NAME_BYTES - 1); if (path) - strncpy(msrp->path, path, PATH_BYTES); + strncpy(msrp->path, path, PATH_BYTES - 1); msrp->width = width; msrp->type = type; msrp->format = format; -- 2.20.1