[PATCH] ld/PDB: fix off-by-1 in add_globals_ref()

[PATCH] ld/PDB: fix off-by-1 in add_globals_ref()

[Jan Beulich]

Copying one too many bytes can corrupt memory, detected and reported by
glibc on a 32-bit distro.
---
Nick, again I expect this wants to go on the branch as well. I'm sorry
that I didn't get to look into this earlier; I had noticed it a while
ago already. In any event I'd like to give Mark a little bit of time
to reply (if necessary), before putting it in.

--- a/ld/pdb.c
+++ b/ld/pdb.c
@@ -880,7 +880,7 @@ add_globals_ref (struct globals *glob, b
   g->offset = bfd_tell (sym_rec_stream);
   g->hash = hash;
   g->refcount = 1;
-  memcpy (g->data, data, len + 1);
+  memcpy (g->data, data, len);
 
   glob->num_entries++;
 

Re: [PATCH] ld/PDB: fix off-by-1 in add_globals_ref()

[Mark Harmstone]

Thanks Jan - this looks good to me.

Mark

On 7/7/23 14:47, Jan Beulich wrote:
> Copying one too many bytes can corrupt memory, detected and reported by
> glibc on a 32-bit distro.
> ---
> Nick, again I expect this wants to go on the branch as well. I'm sorry
> that I didn't get to look into this earlier; I had noticed it a while
> ago already. In any event I'd like to give Mark a little bit of time
> to reply (if necessary), before putting it in.
>
> --- a/ld/pdb.c
> +++ b/ld/pdb.c
> @@ -880,7 +880,7 @@ add_globals_ref (struct globals *glob, b
>     g->offset = bfd_tell (sym_rec_stream);
>     g->hash = hash;
>     g->refcount = 1;
> -  memcpy (g->data, data, len + 1);
> +  memcpy (g->data, data, len);
>   
>     glob->num_entries++;
>   

Re: [PATCH] ld/PDB: fix off-by-1 in add_globals_ref()

[Jan Beulich]

On 11.07.2023 01:30, Mark Harmstone wrote:
> Thanks Jan - this looks good to me.

I've committed this yesterday, so Nick - what about cherry-picking it onto
the branch?

Jan

> On 7/7/23 14:47, Jan Beulich wrote:
>> Copying one too many bytes can corrupt memory, detected and reported by
>> glibc on a 32-bit distro.
>> ---
>> Nick, again I expect this wants to go on the branch as well. I'm sorry
>> that I didn't get to look into this earlier; I had noticed it a while
>> ago already. In any event I'd like to give Mark a little bit of time
>> to reply (if necessary), before putting it in.
>>
>> --- a/ld/pdb.c
>> +++ b/ld/pdb.c
>> @@ -880,7 +880,7 @@ add_globals_ref (struct globals *glob, b
>>     g->offset = bfd_tell (sym_rec_stream);
>>     g->hash = hash;
>>     g->refcount = 1;
>> -  memcpy (g->data, data, len + 1);
>> +  memcpy (g->data, data, len);
>>   
>>     glob->num_entries++;
>>   
> 
> 

Re: [PATCH] ld/PDB: fix off-by-1 in add_globals_ref()

[Nick Clifton]

Hi Jan,

> I've committed this yesterday, so Nick - what about cherry-picking it onto
> the branch?

Done.

Cheers
   Nick

PS.  Sorry for the delay - I have been on PTO.