[PATCH v2][BZ #10253] Fix breaking of RPATH when $ORIGIN contains colons.

Carlos O'Donell carlos@redhat.com
Mon Nov 18 19:18:00 GMT 2013


On 11/18/2013 12:28 PM, Ondřej Bílka wrote:
> On Mon, Nov 18, 2013 at 05:45:05PM +0100, Andreas Schwab wrote:
>> Ondřej Bílka <neleai@seznam.cz> writes:
>>
>>> @@ -627,7 +636,7 @@ decompose_rpath (struct r_search_path_struct *sps,
>>>  
>>>    /* Make a writable copy.  At the same time expand possible dynamic
>>>       string tokens.  */
>>> -  copy = expand_dynamic_string_token (l, rpath, 1);
>>> +  copy = local_strdup (rpath);
>>
>> The comment is no longer accurate.
>>
> Ok, updated. 
> 
> 	[BZ #10253]
> 	* elf/dl-load.c (fillin_rpath): Add linkmap parameter and expand path.
> 	(decompose_rpath): Defer expansion to fillin_rpath.                   
> 	(_dl_init_paths): Pass linkmap to fillin_rpath.
 
This looks good to me.

The only thing I'm trying to determine is would there ever
be a plausible case that worked in the past that doesn't work
now. It would have involved having a directory that looks 
like an unexpanded special name which would be odd and 
unlikely. I'd rather have this fixed than support a weird
workaround.

Cheers,
Carlos.



More information about the Libc-alpha mailing list