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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 18746C33CAF for ; Thu, 16 Jan 2020 17:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5F3824680 for ; Thu, 16 Jan 2020 17:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194564; bh=Ku1iZk0I5wbaIZOihCA+JS9rrQZhPd9PqqMuIKY749I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oUovTgBnPD7jf9bOJMqaCcPapxvgN6ysIvzNmEeaBkx9YCCoIeJA9buXtzG8Cy/Dr 6Fj/dS2obs3jYlU65uHMzi1GI/EAndaydGQmUav5imtJbFAaeOWSUXOFr1n1n/++xv x43L2wYCrEmxJy8Wm6hfYXufCYEN2HtlbiY0psc8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389672AbgAPRJW (ORCPT ); Thu, 16 Jan 2020 12:09:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:44776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389638AbgAPRJQ (ORCPT ); Thu, 16 Jan 2020 12:09:16 -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 BE4732081E; Thu, 16 Jan 2020 17:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194555; bh=Ku1iZk0I5wbaIZOihCA+JS9rrQZhPd9PqqMuIKY749I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TmZmZbCs+CIPiLnZxbuJaOjcOR0C0bpbrryTg9FP0hzinmeLwFCmbhOBKZdgxrBOa HyyWmIom7C9ePtZOasnlS31mX0MMnGIZnsNmFOEK1Pic+gO/TOhh5EZ4SuhKLiG6Bg FKGwCQ2Q3LZprKJz90fX4ww667fgxuHnSuW2OUOo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Quentin Monnet , Roman Gushchin , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 437/671] tools: bpftool: use correct argument in cgroup errors Date: Thu, 16 Jan 2020 12:01:15 -0500 Message-Id: <20200116170509.12787-174-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit 6c6874f401e5a0caab3b6a0663169e1fb5e930bb ] cgroup code tries to use argv[0] as the cgroup path, but if it fails uses argv[1] to report errors. Fixes: 5ccda64d38cc ("bpftool: implement cgroup bpf operations") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Acked-by: Roman Gushchin Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- tools/bpf/bpftool/cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c index ee7a9765c6b3..adbcd84818f7 100644 --- a/tools/bpf/bpftool/cgroup.c +++ b/tools/bpf/bpftool/cgroup.c @@ -164,7 +164,7 @@ static int do_show(int argc, char **argv) cgroup_fd = open(argv[0], O_RDONLY); if (cgroup_fd < 0) { - p_err("can't open cgroup %s", argv[1]); + p_err("can't open cgroup %s", argv[0]); goto exit; } @@ -345,7 +345,7 @@ static int do_attach(int argc, char **argv) cgroup_fd = open(argv[0], O_RDONLY); if (cgroup_fd < 0) { - p_err("can't open cgroup %s", argv[1]); + p_err("can't open cgroup %s", argv[0]); goto exit; } @@ -403,7 +403,7 @@ static int do_detach(int argc, char **argv) cgroup_fd = open(argv[0], O_RDONLY); if (cgroup_fd < 0) { - p_err("can't open cgroup %s", argv[1]); + p_err("can't open cgroup %s", argv[0]); goto exit; } -- 2.20.1