From 70d25cae8b9769d155eb8cabf4095f2b36d9265f Mon Sep 17 00:00:00 2001 From: Tapani Pälli Date: Thu, 16 Mar 2017 08:10:57 +0200 Subject: util/build-id: check dlpi_name before strstr call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Plamena Manolova Reviewed-by: Emil Velikov Reviewed-by: Matt Turner --- 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 c53e71ddfd1..898a15f2b31 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; -- cgit v1.2.3