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,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 56D82C3A5A6 for ; Thu, 29 Aug 2019 18:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25B502166E for ; Thu, 29 Aug 2019 18:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567103194; bh=KgDQ6Jda5LEDY8kDUn5LFXutTM2b8PlpVRDCMS0ev7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0pzXOPuxaZNYcBSQ1UeAELmW0w8huqQr2FV+3dPdNKUwQVZrnmL3OFVKJWgmWzoF1 NWRRObV9umX7OHgxbrnIDV3Bnrm+wV8HyggyyxX0zFWH5ETdhmGoxBeYvWVb9dr79N ASjHD23pCMJjqbT8mtFNoYA0hoGHS5gOU+WNJi70= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729500AbfH2SP4 (ORCPT ); Thu, 29 Aug 2019 14:15:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:57772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729484AbfH2SPy (ORCPT ); Thu, 29 Aug 2019 14:15:54 -0400 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 B891B2189D; Thu, 29 Aug 2019 18:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102553; bh=KgDQ6Jda5LEDY8kDUn5LFXutTM2b8PlpVRDCMS0ev7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=09Hrn0I200NaAq29wcWmzAlcHzXWMll3psuRmC+teAZELS0965EFUgfcYtibw7Soz GBi9CSHV+eWyT9io/vNPkDoRTFT7FNjaSICp64LJIdRHt7lwvta2DFwBjM8oFGFNFu xhti3HaaT2cJHtrxYnWlplEJXDc5vDeUiWub28Aw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Quentin Monnet , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 04/45] tools: bpftool: fix error message (prog -> object) Date: Thu, 29 Aug 2019 14:15:04 -0400 Message-Id: <20190829181547.8280-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181547.8280-1-sashal@kernel.org> References: <20190829181547.8280-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Jakub Kicinski [ Upstream commit b3e78adcbf991a4e8b2ebb23c9889e968ec76c5f ] Change an error message to work for any object being pinned not just programs. Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- tools/bpf/bpftool/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index fcaf00621102f..be7aebff0c1e5 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -238,7 +238,7 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) fd = get_fd_by_id(id); if (fd < 0) { - p_err("can't get prog by id (%u): %s", id, strerror(errno)); + p_err("can't open object by id (%u): %s", id, strerror(errno)); return -1; } -- 2.20.1