linux-kernel - Re: [PATCH v3 2/2] perf pmu: Fix a few potential fd leaks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAP-5=fXeuhYBDvRmu6vQLQFfW=0qBTH9EGmMrFb1sfGsJhGLFg@mail.gmail.com>
Date:   Thu, 6 Apr 2023 14:33:07 -0700
From:   Ian Rogers <irogers@...gle.com>
To:     Arnaldo Carvalho de Melo <acme@...nel.org>
Cc:     Jiri Olsa <jolsa@...nel.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Namhyung Kim <namhyung@...nel.org>,
        Adrian Hunter <adrian.hunter@...el.com>,
        James Clark <james.clark@....com>,
        Suzuki Poulouse <suzuki.poulose@....com>,
        Sean Christopherson <seanjc@...gle.com>,
        Ravi Bangoria <ravi.bangoria@....com>,
        Rob Herring <robh@...nel.org>, Leo Yan <leo.yan@...aro.org>,
        German Gomez <german.gomez@....com>,
        Jing Zhang <renyu.zj@...ux.alibaba.com>,
        Gaosheng Cui <cuigaosheng1@...wei.com>,
        linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 2/2] perf pmu: Fix a few potential fd leaks

On Thu, Apr 6, 2023 at 2:09 PM Arnaldo Carvalho de Melo <acme@...nel.org> wrote:
>
> Em Wed, Apr 05, 2023 at 11:52:24PM -0700, Ian Rogers escreveu:
> > Ensure fd is closed on error paths.
>
> Was this reported by Jiri?

Jiri's one was in the code I modified, whereas these were from
Namhyung's previous openat change. It is the same issue, I'm agnostic
on whether it needs a tag or not.

Thanks,
Ian

> - Arnaldo
>
> > Signed-off-by: Ian Rogers <irogers@...gle.com>
> > ---
> >  tools/perf/util/pmu.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> > index 96ef317bac41..9eedbfc9e863 100644
> > --- a/tools/perf/util/pmu.c
> > +++ b/tools/perf/util/pmu.c
> > @@ -494,9 +494,13 @@ static int pmu_aliases_parse(int dirfd, struct list_head *head)
> >                       continue;
> >
> >               fd = openat(dirfd, name, O_RDONLY);
> > +             if (fd == -1) {
> > +                     pr_debug("Cannot open %s\n", name);
> > +                     continue;
> > +             }
> >               file = fdopen(fd, "r");
> >               if (!file) {
> > -                     pr_debug("Cannot open %s\n", name);
> > +                     close(fd);
> >                       continue;
> >               }
> >
> > @@ -1882,9 +1886,13 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)
> >                       continue;
> >
> >               fd = openat(caps_fd, name, O_RDONLY);
> > +             if (fd == -1)
> > +                     continue;
> >               file = fdopen(fd, "r");
> > -             if (!file)
> > +             if (!file) {
> > +                     close(fd);
> >                       continue;
> > +             }
> >
> >               if (!fgets(value, sizeof(value), file) ||
> >                   (perf_pmu__new_caps(&pmu->caps, name, value) < 0)) {
> > --
> > 2.40.0.348.gf938b09366-goog
> >
>
> --
>
> - Arnaldo