From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 360CE3858025; Wed, 13 Apr 2022 14:10:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 360CE3858025 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] elf: Fix memory leak in _dl_find_object_update (bug 29062) X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: db03235895150a91fb5bd84dd3f49b4d8ec8bc72 X-Git-Newrev: cc9a4a664faac44fe62b6300b878cf5be514658b Message-Id: <20220413141026.360CE3858025@sourceware.org> Date: Wed, 13 Apr 2022 14:10:26 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2022 14:10:26 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cc9a4a664faac44fe62b6300b878cf5be514658b commit cc9a4a664faac44fe62b6300b878cf5be514658b Author: Florian Weimer Date: Wed Apr 13 14:18:28 2022 +0200 elf: Fix memory leak in _dl_find_object_update (bug 29062) The count can be zero if an object has already been loaded as an indirect dependency (so that l_searchlist.r_list in its link map is still NULL) is promoted to global scope via RTLD_GLOBAL. Fixes commit 5d28a8962dc ("elf: Add _dl_find_object function"). (cherry picked from commit 4a41fc3cd9cea9223ea4f13f9c766a1e149a0ccc) Diff: --- NEWS | 1 + elf/dl-find_object.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cc64dbf58f..728670db02 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ The following bugs are resolved with this release: [28896] strncmp-avx2-rtm and wcsncmp-avx2-rtm fallback on non-rtm variants when avoiding overflow [28953] nss: Protect against errno changes in function lookup + [29062] elf: Fix memory leak in _dl_find_object_update Version 2.35 diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c index 2b8df2fd67..4d5831b6f4 100644 --- a/elf/dl-find_object.c +++ b/elf/dl-find_object.c @@ -788,6 +788,9 @@ _dl_find_object_update (struct link_map *new_map) for (struct link_map *l = new_map; l != NULL; l = l->l_next) /* Skip proxy maps and already-processed maps. */ count += l == l->l_real && !l->l_find_object_processed; + if (count == 0) + return true; + struct link_map **map_array = malloc (count * sizeof (*map_array)); if (map_array == NULL) return false; @@ -797,8 +800,6 @@ _dl_find_object_update (struct link_map *new_map) if (l == l->l_real && !l->l_find_object_processed) map_array[i++] = l; } - if (count == 0) - return true; _dl_find_object_link_map_sort (map_array, count); bool ok = _dl_find_object_update_1 (map_array, count);