From 8c59ed1f7454cba46c29ceba07322a75f9eb78ad Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 28 Oct 2019 19:49:46 +0100 Subject: Remove all loaded objects if dlopen fails [BZ #20839] --- include/link.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'include/link.h') diff --git a/include/link.h b/include/link.h index 1184201..2bf6339 100644 --- a/include/link.h +++ b/include/link.h @@ -79,6 +79,21 @@ struct r_search_path_struct int malloced; }; +/* Type used by the l_nodelete member. */ +enum link_map_nodelete +{ + /* This link map can be deallocated. */ + link_map_nodelete_inactive, + + /* This link map cannot be deallocated. */ + link_map_nodelete_active, + + /* This link map cannot be deallocated after dlopen has succeded. + dlopen turns this into link_map_nodelete_active. dlclose treats + this intermediate state as link_map_nodelete_active. */ + link_map_nodelete_pending, +}; + /* Structure describing a loaded shared object. The `l_next' and `l_prev' members form a chain of all the shared objects loaded at startup. @@ -203,6 +218,10 @@ struct link_map freed, ie. not allocated with the dummy malloc in ld.so. */ + /* Actually of type enum link_map_nodelete. Separate byte due to + concurrent access. Only valid for l_type == lt_loaded. */ + unsigned char l_nodelete; + #include /* Collected information about own RPATH directories. */ -- cgit v1.1