Merge tag 'perf-tools-for-v5.15-2021-09-11' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / tools / perf / util / dso.c

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index ee15db2..9ed9a56 100644 (file)
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -1349,6 +1349,16 @@ void dso__set_build_id(struct dso *dso, struct build_id *bid)
 
 bool dso__build_id_equal(const struct dso *dso, struct build_id *bid)
 {
 
 bool dso__build_id_equal(const struct dso *dso, struct build_id *bid)
 {

+       if (dso->bid.size > bid->size && dso->bid.size == BUILD_ID_SIZE) {
+               /*
+                * For the backward compatibility, it allows a build-id has
+                * trailing zeros.
+                */
+               return !memcmp(dso->bid.data, bid->data, bid->size) &&
+                       !memchr_inv(&dso->bid.data[bid->size], 0,
+                                   dso->bid.size - bid->size);
+       }
+

        return dso->bid.size == bid->size &&
               memcmp(dso->bid.data, bid->data, dso->bid.size) == 0;
 }
        return dso->bid.size == bid->size &&
               memcmp(dso->bid.data, bid->data, dso->bid.size) == 0;
 }