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 61760C3A5A8 for ; Wed, 4 Sep 2019 16:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C72B21883 for ; Wed, 4 Sep 2019 16:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613504; bh=nQm9fmpxpPMRbefy42NAkue3FZlAfMV+pg0Kwb0mokM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c0zohdFNasRmPS7LOz6ICvNshHAn92n+odmwc07sAdfQe7tBXPdxQXKIfOWBRhmxj gukZuXyL6hSqVbNSiyTVRHjFntx0L1zseO1U/E1P7B+dGrHNjOnz4LEn/wKPXD6IPu d0ypxaKiwOkaaJShoG8Li87xVwC2nsk9j3Rk70EY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732701AbfIDQA1 (ORCPT ); Wed, 4 Sep 2019 12:00:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:35298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732689AbfIDQA0 (ORCPT ); Wed, 4 Sep 2019 12:00:26 -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 1F7F22070C; Wed, 4 Sep 2019 16:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612826; bh=nQm9fmpxpPMRbefy42NAkue3FZlAfMV+pg0Kwb0mokM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wi7iUWNmB83ZERmMX4lIOvYLltyn/wO1zkHV3WR2D0Fg2N/QXtujxBwvLP/StIdhq Tli0hVywS0H2Mgh0nM284VXzClfiz486c3rczH+C9LYuj6fD5tH3YUyj76vU4aN1fW pUn0g4izf5gt6Q4PEANS4BoJNHGcf/Yw9MwkY27g= 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 4.19 14/52] tools: bpftool: close prog FD before exit on showing a single program Date: Wed, 4 Sep 2019 11:59:26 -0400 Message-Id: <20190904160004.3671-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160004.3671-1-sashal@kernel.org> References: <20190904160004.3671-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 bbba0d61570fe..4f9611af46422 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -381,7 +381,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