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,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 481CDC49ED7 for ; Thu, 19 Sep 2019 22:32:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EA9D217D6 for ; Thu, 19 Sep 2019 22:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932354; bh=nQm9fmpxpPMRbefy42NAkue3FZlAfMV+pg0Kwb0mokM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2efFjKnSZxkHhuIDI44/8ExKOgxJpeDTla3n8Xgj3euVwaWm8Gnxiz/fqGTssh6Bu TsxMm/aD7V9OC5JnMhk1RmQi/kxBvKNxPRCaF1lyf2JH6WSo5U49yXQQBHD86UsMS3 9wUMNcxwbD3aXwlYvrjyHufdLzhevmCuyRNxTyiA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406030AbfISWNC (ORCPT ); Thu, 19 Sep 2019 18:13:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:52090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406026AbfISWNC (ORCPT ); Thu, 19 Sep 2019 18:13:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 6C3AF21907; Thu, 19 Sep 2019 22:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931181; bh=nQm9fmpxpPMRbefy42NAkue3FZlAfMV+pg0Kwb0mokM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F/OWM5tQXGYBn+kbTSvTvEJs/I/I7QfDVtq6RgI9NPnIRvNHFSeYjkFtI7GfRXoUS j30uloUQrJBt/Ul87kbYn+LvB0KlsYVDtfNMxih9wcWRostHT8rmY5UBefwm5zQkoB 9J+VvBgOYHkOhln14oAnBVGeFzQf1Wd33QohdX2w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Quentin Monnet , Jakub Kicinski , Andrii Nakryiko , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.19 31/79] tools: bpftool: close prog FD before exit on showing a single program Date: Fri, 20 Sep 2019 00:03:16 +0200 Message-Id: <20190919214810.531834718@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214807.612593061@linuxfoundation.org> References: <20190919214807.612593061@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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