Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 18 Nov 2020 10:11:24 +0100
From:   Jiri Olsa <jolsa@redhat.com>
To:     Ian Rogers <irogers@google.com>
Cc:     Jiri Olsa <jolsa@kernel.org>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Ingo Molnar <mingo@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Song Liu <songliubraving@fb.com>,
        Stephane Eranian <eranian@google.com>,
        Alexey Budankov <alexey.budankov@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Adrian Hunter <adrian.hunter@intel.com>
Subject: Re: [PATCH 09/24] perf tools: Add check for existing link in buildid
 dir
Message-ID: <20201118091124.GA1414446@krava>
References: <20201117110053.1303113-1-jolsa@kernel.org>
 <20201117110053.1303113-10-jolsa@kernel.org>
 <CAP-5=fVc9i2EXPEqzOEHt5xrxqXiR_58KettKqrR9GJdic4sOQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAP-5=fVc9i2EXPEqzOEHt5xrxqXiR_58KettKqrR9GJdic4sOQ@mail.gmail.com>
Precedence: bulk

On Tue, Nov 17, 2020 at 01:23:09PM -0800, Ian Rogers wrote:
> On Tue, Nov 17, 2020 at 3:01 AM Jiri Olsa <jolsa@kernel.org> wrote:
> 
> > When adding new build id link we fail if the link is already
> > there. Adding check for existing link and output debug message
> > that the build id is already linked.
> >
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  tools/perf/util/build-id.c | 15 ++++++++++++++-
> >  1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> > index 7d9ecc37849c..ef9a31b54ba2 100644
> > --- a/tools/perf/util/build-id.c
> > +++ b/tools/perf/util/build-id.c
> > @@ -754,8 +754,21 @@ int build_id_cache__add_s(const char *sbuild_id,
> > const char *name,
> >         tmp = dir_name + strlen(buildid_dir) - 5;
> >         memcpy(tmp, "../..", 5);
> >
> > -       if (symlink(tmp, linkname) == 0)
> > +       if (symlink(tmp, linkname) == 0) {
> >                 err = 0;
> > +       } else if (errno == EEXIST) {
> > +               char path[PATH_MAX];
> > +
> > +               if (readlink(linkname, path, sizeof(path)) == -1) {
> > +                       pr_err("Cant read link: %s\n", linkname);
> > +                       goto out_free;
> > +               }
> >
> 
> readlink needs null termination, such as:
> https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/tree/tools/perf/util/build-id.c?h=perf/core#n212

will fix, thanks

jirka

> 
> Thanks,
> Ian
> 
> +               if (strcmp(tmp, path)) {
> > +                       pr_debug("build <%s> already linked to %s\n",
> > +                                sbuild_id, linkname);
> > +               }
> > +               err = 0;
> > +       }
> >
> >         /* Update SDT cache : error is just warned */
> >         if (realname &&
> > --
> > 2.26.2
> >
> >