From 21dd8814169e81f3dd398d17311b688f83b653c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 23 May 2019 15:17:51 +0200 Subject: [PATCH] ac/rtld: report better error messages for LDS overallocation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Tested-by: Dieter Nützel --- src/amd/common/ac_rtld.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_rtld.c b/src/amd/common/ac_rtld.c index 18f198f8af2..57d6b0151b4 100644 --- a/src/amd/common/ac_rtld.c +++ b/src/amd/common/ac_rtld.c @@ -290,7 +290,12 @@ bool ac_rtld_open(struct ac_rtld_binary *binary, uint64_t shared_lds_size = 0; if (!layout_symbols(binary->lds_symbols.data, i.num_shared_lds_symbols, &shared_lds_size)) goto fail; - report_if(shared_lds_size > max_lds_size); + + if (shared_lds_size > max_lds_size) { + fprintf(stderr, "ac_rtld error(1): too much LDS (used = %u, max = %u)\n", + (unsigned)shared_lds_size, max_lds_size); + goto fail; + } binary->lds_size = shared_lds_size; /* First pass over all parts: open ELFs, pre-determine the placement of @@ -391,7 +396,11 @@ bool ac_rtld_open(struct ac_rtld_binary *binary, lds_end->part_idx = ~0u; } - report_elf_if(binary->lds_size > max_lds_size); + if (binary->lds_size > max_lds_size) { + fprintf(stderr, "ac_rtld error(2): too much LDS (used = %u, max = %u)\n", + (unsigned)binary->lds_size, max_lds_size); + goto fail; + } /* Second pass: Adjust offsets of non-pasted text sections. */ binary->rx_size = pasted_text_size; -- 2.30.2