Mesa (master): util/build-id: check dlpi_name before strstr call

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 70d25cae8b9769d155eb8cabf4095f2b36d9265f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70d25cae8b9769d155eb8cabf4095f2b36d9265f

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Mar 16 08:10:57 2017 +0200

util/build-id: check dlpi_name before strstr call

According to dl_iterate_phdr man page first object visited is the
main program where dlpi_name is an empty string. This fixes segfault
on Android when using build-id as identifier.

Fixes: d4fa083e11f ("util: Add utility build-id code.")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Plamena Manolova <plamena.manolova at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/util/build_id.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/util/build_id.c b/src/util/build_id.c
index c53e71ddfd..898a15f2b3 100644
--- a/src/util/build_id.c
+++ b/src/util/build_id.c
@@ -55,6 +55,12 @@ build_id_find_nhdr_callback(struct dl_phdr_info *info, size_t size, void *data_)
 {
    struct callback_data *data = data_;
 
+   /* The first object visited by callback is the main program.
+    * Android's libc returns a NULL pointer for the first executable.
+    */
+   if (info->dlpi_name == NULL)
+      return 0;
+
    char *ptr = strstr(info->dlpi_name, data->filename);
    if (ptr == NULL || ptr[strlen(data->filename)] != '\0')
       return 0;