From de86cd3ee3a4fdc072cbcfa1b87abcdba472263f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 16 Jan 2020 06:45:36 -0800 Subject: [PATCH] Clear GL(dl_initfirst) when freeing its link_map memory [BZ# 25396] We should clear GL(dl_initfirst) when freeing its link_map memory. Tested on Fedora 31/x86-64 with CET. --- elf/dl-close.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/elf/dl-close.c b/elf/dl-close.c index 104c299209..73b2817bbf 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -756,6 +756,10 @@ _dl_close_worker (struct link_map *map, bool force) if (imap->l_runpath_dirs.dirs != (void *) -1) free (imap->l_runpath_dirs.dirs); + /* Clear GL(dl_initfirst) when freeing its link_map memory. */ + if (imap == GL(dl_initfirst)) + GL(dl_initfirst) = NULL; + free (imap); } } -- 2.24.1