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,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 17FA2C2D0DB for ; Fri, 24 Jan 2020 11:28:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D95F620704 for ; Fri, 24 Jan 2020 11:28:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865333; bh=3lgcFBKJKbVwE2Hfs1ASQbPTBkbI0WqglpVRsQiJUps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZB77zG4WrpMhgpXPV6QqffOehkk4B9z57e5f8tkIJoEPjws90u/PCVoYvg3cT6A3b bPAcHKhtIpC7lGrHDmg6OuwdChM1vnWLyJWEe50n5QA9T+plsuFh76Sr0k/jvFR3fJ gLft3oUqWUXUJYnHHxP8RXip35Oq0Czz7NKzl0Ts= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391740AbgAXL2v (ORCPT ); Fri, 24 Jan 2020 06:28:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:45186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391727AbgAXL2t (ORCPT ); Fri, 24 Jan 2020 06:28:49 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 A59C720718; Fri, 24 Jan 2020 11:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865328; bh=3lgcFBKJKbVwE2Hfs1ASQbPTBkbI0WqglpVRsQiJUps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rlDYq/d9nu5zE2ZBNn+hs/asxMXSqTTRvt9qrhUl2jiNHWQCo00LDBW4wB5OTHcI0 vhLpHciCmsgHOLSJiP6Ud+Sk1kD91+vWxIaIPyr8tXpHT77Bbu+0QTFCuRwhJi1Yh/ p5UgONz45mUJwnPIxpnkMzT8By+Qs579PgP9DPis= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quentin Monnet , Jakub Kicinski , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.19 508/639] tools: bpftool: fix arguments for p_err() in do_event_pipe() Date: Fri, 24 Jan 2020 10:31:18 +0100 Message-Id: <20200124093152.424163675@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: Quentin Monnet [ Upstream commit 9def249dc8409ffc1f5a1d7195f1c462f2b49c07 ] The last argument passed to some calls to the p_err() functions is not correct, it should be "*argv" instead of "**argv". This may lead to a segmentation fault error if CPU IDs or indices from the command line cannot be parsed correctly. Let's fix this. Fixes: f412eed9dfde ("tools: bpftool: add simple perf event output reader") Signed-off-by: Quentin Monnet Reviewed-by: Jakub Kicinski Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- tools/bpf/bpftool/map_perf_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bpf/bpftool/map_perf_ring.c b/tools/bpf/bpftool/map_perf_ring.c index 6d41323be291b..8ec0148d7426d 100644 --- a/tools/bpf/bpftool/map_perf_ring.c +++ b/tools/bpf/bpftool/map_perf_ring.c @@ -205,7 +205,7 @@ int do_event_pipe(int argc, char **argv) NEXT_ARG(); cpu = strtoul(*argv, &endptr, 0); if (*endptr) { - p_err("can't parse %s as CPU ID", **argv); + p_err("can't parse %s as CPU ID", *argv); goto err_close_map; } @@ -216,7 +216,7 @@ int do_event_pipe(int argc, char **argv) NEXT_ARG(); index = strtoul(*argv, &endptr, 0); if (*endptr) { - p_err("can't parse %s as index", **argv); + p_err("can't parse %s as index", *argv); goto err_close_map; } -- 2.20.1