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=-14.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 7136AC282C8 for ; Mon, 28 Jan 2019 17:39:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3923D2148E for ; Mon, 28 Jan 2019 17:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548697167; bh=q8DzAp34lYBxPSffFdjp8e5oHoVo9ZTYXiENwKbkM1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oK3KKgOJxoe91o1Q9Fn8tXoo7z9A0Cs8KgWPhCgwYzkkW8LbxaIhfv07Z9/Fsieek Stgfis77FCbitVLpWAdCCGNBfnIFIbH4MNGwi0EhNWMlqTMh3J2bglCXEJbLY+1+C7 NfqdFfxnA8HX5w/p5zdc86aTxLX4rqfXHzs0k02A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729484AbfA1Pxg (ORCPT ); Mon, 28 Jan 2019 10:53:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:39898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729474AbfA1Pxc (ORCPT ); Mon, 28 Jan 2019 10:53:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E9D912175B; Mon, 28 Jan 2019 15:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690812; bh=q8DzAp34lYBxPSffFdjp8e5oHoVo9ZTYXiENwKbkM1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPI39HFNFsjGFmWjSYCuxFbTpQ+5OKWQGzTcKilVd/fEP3iyS/QGxf27A+pyomlD/ lNQV2uyo8uBaR7y4MHDAQE1m5MsbV6myBzyAgQHg5jeMVXHiDcskUfhOrW5EIOtuF9 3i1Clg/Kr+sPa4BbRG/H49aH/SpqaDb0qkXqJ2Ck= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Adrian Hunter , Jiri Olsa , Namhyung Kim , Sasha Levin Subject: [PATCH AUTOSEL 4.20 199/304] perf header: Fix unchecked usage of strncpy() Date: Mon, 28 Jan 2019 10:41:56 -0500 Message-Id: <20190128154341.47195-199-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnaldo Carvalho de Melo [ Upstream commit 7572588085a13d5db02bf159542189f52fdb507e ] The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it. This fixes this warning on an Alpine Linux Edge system with gcc 8.2: util/header.c: In function 'perf_event__synthesize_event_update_unit': util/header.c:3586:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation] strncpy(ev->data, evsel->unit, size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/header.c:3579:16: note: length computed here size_t size = strlen(evsel->unit); ^~~~~~~~~~~~~~~~~~~ Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Fixes: a6e5281780d1 ("perf tools: Add event_update event unit type") Link: https://lkml.kernel.org/n/tip-fiikh5nay70bv4zskw2aa858@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 4fd45be95a43..13a2251a37c5 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3544,7 +3544,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool, if (ev == NULL) return -ENOMEM; - strncpy(ev->data, evsel->unit, size); + strlcpy(ev->data, evsel->unit, size + 1); err = process(tool, (union perf_event *)ev, NULL, NULL); free(ev); return err; -- 2.19.1