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=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 CDFE6C3A5A8 for ; Wed, 4 Sep 2019 15:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B3DF23401 for ; Wed, 4 Sep 2019 15:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612694; bh=1mpdEmxlulUxMm5dMbUBfyxVH2N8bAtQhPgQoAI14Lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R17nfBgqs7eAkgCJ0BEGxfdJhGXexeV48p8t3S4pgXxlJ9DVKRdpHj/6JbkunjCgr Bxap5Y0bl9iDoJLem8SPNTYk/GRxSroEy4mxLdI5iXCDNz/+jKBD05Z4KdiZoiH/E0 Odvp+4N/ytMs6O+XG2612ph5PRoW8s6O2IIGgtzY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731819AbfIDP6N (ORCPT ); Wed, 4 Sep 2019 11:58:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:60156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731774AbfIDP6N (ORCPT ); Wed, 4 Sep 2019 11:58:13 -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 454C723401; Wed, 4 Sep 2019 15:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612692; bh=1mpdEmxlulUxMm5dMbUBfyxVH2N8bAtQhPgQoAI14Lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zX1dHb6bNxMJCpAEth9ULEbpuaGzsz6HsdtL/4+tbvG8/qK/NBwKUfoYktRnZopF4 ghwDbU5K2P9xngGuj9yzZhUM4iYOOtU3JFOsCi7PwL65BwAEK/ojz5ApEoWwmKOEM3 hop2H++4kZGLr2ISPUL5Zk889pxnLP/ppi6fU4+A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Quentin Monnet , Jakub Kicinski , Andrii Nakryiko , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 20/94] tools: bpftool: close prog FD before exit on showing a single program Date: Wed, 4 Sep 2019 11:56:25 -0400 Message-Id: <20190904155739.2816-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Quentin Monnet [ Upstream commit d34b044038bfb0e19caa8b019910efc465f41d5f ] When showing metadata about a single program by invoking "bpftool prog show PROG", the file descriptor referring to the program is not closed before returning from the function. Let's close it. Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool") Signed-off-by: Quentin Monnet Reviewed-by: Jakub Kicinski Acked-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- tools/bpf/bpftool/prog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 7a4e21a315236..d41651afe5f64 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -362,7 +362,9 @@ static int do_show(int argc, char **argv) if (fd < 0) return -1; - return show_prog(fd); + err = show_prog(fd); + close(fd); + return err; } if (argc) -- 2.20.1