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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 A7024C3A59C for ; Thu, 15 Aug 2019 17:30:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C0AA2064A for ; Thu, 15 Aug 2019 17:30:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="Zd5hGD+L" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730568AbfHORaj (ORCPT ); Thu, 15 Aug 2019 13:30:39 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:45232 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726545AbfHORaj (ORCPT ); Thu, 15 Aug 2019 13:30:39 -0400 Received: by mail-qk1-f195.google.com with SMTP id m2so2419573qki.12 for ; Thu, 15 Aug 2019 10:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=kTXwh3ITHtbuzL/JpnSHLuhe4DA+bICqQKV7LfiAy7M=; b=Zd5hGD+L09TBXib4aG8KMAx4pu4d0xdhyVaeyRrIovmsgBWBsssft6eQ9eeddRvKQV PJqceHEJUiJW2SstS3zHM3ntdFxCoEFvlHQA9YPKzcjWAvmf2TcupYGGQ7O8tkKhbtZn uqqtHRPpqN9AfB8Ni3Iul/AT5Ilm+MJY/LB8uwYXpa5ML+PrSCErbIAIC1bfBl6Z1JcS UPmKC+wFJy7l47dZX7gDuJE8yEi/W+Mh1653bQ+i6ySzBZxZkeKNCKgYGR6ZglrceBkr S/cAvqa2HtEOJZiTb3p0gfR+uMv/JvSwiPx9JobGHaO7SQExdDpwscdt/Kz5CTieL2Ft OB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=kTXwh3ITHtbuzL/JpnSHLuhe4DA+bICqQKV7LfiAy7M=; b=h37mOBwXkGj480+EggNAq4YwybWoczHPVhk3WDKn2C4o0Hgi1URArWExqQpkalOKqb Y9FKkuBRCXWLS5WxWlAmG8kyAfXBTqIkP7fzCnVr/nobg5ILch999gRmukFXMxdNaHSz 5GOKmiRib5HWMvDt0qZBxv1SJYzVsfn+uzyUFrREDJY/hJJmksqhf5EhgyvAj0VF3GRV mJTyvxrzFUESINCPvOKapa77xez5PVZYxHY0knj+blgjVsJY4GpX0fUGQ1d7283jlVtf RMNV+hcMVQ7vqk5UagTG9Pp1hmhISpsn0QAo4S4z+V/auV6RDBt8A2ui4emb40/qm4j/ yLuQ== X-Gm-Message-State: APjAAAXA4n3YYsi9FYCzV+QnecpaDqAEkeOyGOR/F7A8YTBh9sD9d1uO Y/mcTEiCSXDIyoWNr2AxhZqjpA== X-Google-Smtp-Source: APXvYqwO1aQB1OxnAqtkNli05DpdgUH1L8j8p1pJtfd09Aqg+Y+EpJghSL2tuW6JKyhSqv5Lg3icrQ== X-Received: by 2002:a37:9802:: with SMTP id a2mr5166879qke.346.1565890238320; Thu, 15 Aug 2019 10:30:38 -0700 (PDT) Received: from cakuba.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id s184sm1783093qkf.73.2019.08.15.10.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 10:30:38 -0700 (PDT) Date: Thu, 15 Aug 2019 10:30:23 -0700 From: Jakub Kicinski To: Andrii Nakryiko Cc: Quentin Monnet , Alexei Starovoitov , Daniel Borkmann , bpf , Networking , oss-drivers@netronome.com Subject: Re: [PATCH bpf] tools: bpftool: close prog FD before exit on showing a single program Message-ID: <20190815103023.0bd2c210@cakuba.netronome.com> In-Reply-To: References: <20190815142223.2203-1-quentin.monnet@netronome.com> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 15 Aug 2019 10:09:38 -0700, Andrii Nakryiko wrote: > On Thu, Aug 15, 2019 at 7:24 AM Quentin Monnet wrote: > > 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 > > --- > > 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 66f04a4846a5..43fdbbfe41bb 100644 > > --- a/tools/bpf/bpftool/prog.c > > +++ b/tools/bpf/bpftool/prog.c > > @@ -363,7 +363,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; > > There is a similar problem few lines above for special case of argc == > 2, which you didn't fix. This is the special argc == 2 case. > Would it be better to make show_prog(fd) close provided fd instead or > is it used in some other context where FD should live longer (I > haven't checked, sorry)? I think it used to close that's how the bug crept in. Other than the bug it's fine the way it is.