[PATCH v4 1/3] elf: Allow dlopen of filter object to work [BZ #16272]

[David Kilroy]

Andreas wrote:
> On Jan 29 2020, David Kilroy wrote:
> 
> > diff --git a/elf/dl-deps.c b/elf/dl-deps.c
> > index 5103a8a..0730ea9 100644
> > --- a/elf/dl-deps.c
> > +++ b/elf/dl-deps.c
> > @@ -485,14 +485,18 @@ _dl_map_object_deps (struct link_map *map,
> >
> >    map->l_searchlist.r_list = &l_initfini[nlist + 1];
> >    map->l_searchlist.r_nlist = nlist;
> > +  unsigned int map_index = UINT_MAX;
> >
> >    for (nlist = 0, runp = known; runp; runp = runp->next)
> >      {
> >        if (__builtin_expect (trace_mode, 0) && runp->map->l_faked)
> >  	/* This can happen when we trace the loading.  */
> >  	--map->l_searchlist.r_nlist;
> > -      else
> > +      else {
> > +	if (runp->map == map)
> > +	  map_index = nlist;
> >  	map->l_searchlist.r_list[nlist++] = runp->map;
> > +      }
> 
> Wrong indentation.

Whoops. I'll fix up the breakage.


Apologies,

Dave.