AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

_dl_map_object_from_fd: Remove unnecessary debugger notification in error path

Browse Source 
After commit ed3ce71f5c ("elf: Move la_activity (LA_ACT_ADD) after
_dl_add_to_namespace_list() (BZ #28062)") it is no longer necessary to
reset the debugger state in the error case, since the debugger
notification only happens after no more errors can occur.
This commit is contained in:
Andreas Schwab 2023-03-23 16:18:50 +01:00
parent ab991a3d1b
commit 152f863926
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elf/dl-load.c
View File

@ -951,8 +951,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
/* Initialize to keep the compiler happy. */ /* Initialize to keep the compiler happy. */
const char *errstring = NULL; const char *errstring = NULL;
int errval = 0; int errval = 0;
struct r_debug *r = _dl_debug_update (nsid);
bool make_consistent = false;
/* Get file information. To match the kernel behavior, do not fill /* Get file information. To match the kernel behavior, do not fill
in this information for the executable in case of an explicit in this information for the executable in case of an explicit
@ -984,14 +982,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd,
free ((void *) l->l_phdr); free ((void *) l->l_phdr);
free (l); free (l);
free (realname); free (realname);
if (make_consistent && r != NULL)
{
r->r_state = RT_CONSISTENT;
_dl_debug_state ();
LIBC_PROBE (map_failed, 2, nsid, r);
}
_dl_signal_error (errval, name, NULL, errstring); _dl_signal_error (errval, name, NULL, errstring);
} }
@ -1494,6 +1484,7 @@ cannot enable executable stack as shared object requires");
_dl_add_to_namespace_list (l, nsid); _dl_add_to_namespace_list (l, nsid);
/* Signal that we are going to add new objects. */ /* Signal that we are going to add new objects. */
struct r_debug *r = _dl_debug_update (nsid);
if (r->r_state == RT_CONSISTENT) if (r->r_state == RT_CONSISTENT)
{ {
#ifdef SHARED #ifdef SHARED
@ -1510,7 +1501,6 @@ cannot enable executable stack as shared object requires");
r->r_state = RT_ADD; r->r_state = RT_ADD;
_dl_debug_state (); _dl_debug_state ();
LIBC_PROBE (map_start, 2, nsid, r); LIBC_PROBE (map_start, 2, nsid, r);
make_consistent = true;
} }
else else
assert (r->r_state == RT_ADD); assert (r->r_state == RT_ADD);