linux-kernel - Re: [PATCH v4 07/53] tools api fs: Avoid reading whole file for a 1 byte bool

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=fWvUOiMBeDzJboihg+vPrSEBYkAju1X-JpnwTadG1XBiQ@mail.gmail.com>
Date:   Mon, 27 Nov 2023 12:41:32 -0800
From:   Ian Rogers <irogers@...gle.com>
To:     Namhyung Kim <namhyung@...nel.org>
Cc:     Peter Zijlstra <peterz@...radead.org>,
        Ingo Molnar <mingo@...hat.com>,
        Arnaldo Carvalho de Melo <acme@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Jiri Olsa <jolsa@...nel.org>,
        Adrian Hunter <adrian.hunter@...el.com>,
        Nick Terrell <terrelln@...com>,
        Kan Liang <kan.liang@...ux.intel.com>,
        Andi Kleen <ak@...ux.intel.com>,
        Kajol Jain <kjain@...ux.ibm.com>,
        Athira Rajeev <atrajeev@...ux.vnet.ibm.com>,
        Huacai Chen <chenhuacai@...nel.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Vincent Whitchurch <vincent.whitchurch@...s.com>,
        "Steinar H. Gunderson" <sesse@...gle.com>,
        Liam Howlett <liam.howlett@...cle.com>,
        Miguel Ojeda <ojeda@...nel.org>,
        Colin Ian King <colin.i.king@...il.com>,
        Dmitrii Dolgov <9erthalion6@...il.com>,
        Yang Jihong <yangjihong1@...wei.com>,
        Ming Wang <wangming01@...ngson.cn>,
        James Clark <james.clark@....com>,
        K Prateek Nayak <kprateek.nayak@....com>,
        Sean Christopherson <seanjc@...gle.com>,
        Leo Yan <leo.yan@...aro.org>,
        Ravi Bangoria <ravi.bangoria@....com>,
        German Gomez <german.gomez@....com>,
        Changbin Du <changbin.du@...wei.com>,
        Paolo Bonzini <pbonzini@...hat.com>, Li Dong <lidong@...o.com>,
        Sandipan Das <sandipan.das@....com>,
        liuwenyu <liuwenyu7@...wei.com>, linux-kernel@...r.kernel.org,
        linux-perf-users@...r.kernel.org
Subject: Re: [PATCH v4 07/53] tools api fs: Avoid reading whole file for a 1
 byte bool

On Sun, Nov 5, 2023 at 7:56 PM Namhyung Kim <namhyung@...nel.org> wrote:
>
> On Thu, Nov 2, 2023 at 10:58 AM Ian Rogers <irogers@...gle.com> wrote:
> >
> > sysfs__read_bool used the first byte from a fully read file into a
> > string. It then looked at the first byte's value. Avoid doing this and
> > just read the first byte.
> >
> > Signed-off-by: Ian Rogers <irogers@...gle.com>
> > ---
> >  tools/lib/api/fs/fs.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
> > index 496812b5f1d2..4c35a689d1fc 100644
> > --- a/tools/lib/api/fs/fs.c
> > +++ b/tools/lib/api/fs/fs.c
> > @@ -447,15 +447,16 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep)
> >
> >  int sysfs__read_bool(const char *entry, bool *value)
> >  {
> > -       char *buf;
> > -       size_t size;
> > -       int ret;
> > +       struct io io;
> > +       char bf[16];
> > +       int ret = 0;
> >
> > -       ret = sysfs__read_str(entry, &buf, &size);
> > -       if (ret < 0)
> > -               return ret;
> > +       io.fd = open(entry, O_RDONLY);
>
> The entry is a name in sysfs, so you need to get the full name.
>
> Thanks,
> Namhyung

Thanks, added in v5.

Ian

>
> > +       if (io.fd < 0)
> > +               return -errno;
> >
> > -       switch (buf[0]) {
> > +       io__init(&io, io.fd, bf, sizeof(bf));
> > +       switch (io__get_char(&io)) {
> >         case '1':
> >         case 'y':
> >         case 'Y':
> > @@ -469,8 +470,7 @@ int sysfs__read_bool(const char *entry, bool *value)
> >         default:
> >                 ret = -1;
> >         }
> > -
> > -       free(buf);
> > +       close(io.fd);
> >
> >         return ret;
> >  }
> > --
> > 2.42.0.869.gea05f2083d-goog
> >