[PATCH] powerpc: Fix POWER10 selection

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] powerpc: Fix POWER10 selection

Sourceware - libc-alpha mailing list
Add a line that was missing from a previous commit.
Without increasing str, the null-byte is not validated, and
_dl_string_platform returns -1.

Fixes: d2ba3677da7a ("powerpc: Add support for POWER10")
---
 sysdeps/powerpc/dl-procinfo.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
index 497dc568e9..f07500619a 100644
--- a/sysdeps/powerpc/dl-procinfo.h
+++ b/sysdeps/powerpc/dl-procinfo.h
@@ -96,6 +96,7 @@ _dl_string_platform (const char *str)
   if (str[1] == '0')
     {
       ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
+      str++;
     }
   else
     return -1;
--
2.25.4

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] powerpc: Fix POWER10 selection

Sourceware - libc-alpha mailing list


On 7/15/20 6:04 PM, Tulio Magno Quites Machado Filho via Libc-alpha wrote:

> Add a line that was missing from a previous commit.
> Without increasing str, the null-byte is not validated, and
> _dl_string_platform returns -1.
>
> Fixes: d2ba3677da7a ("powerpc: Add support for POWER10")
> ---
>   sysdeps/powerpc/dl-procinfo.h | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
> index 497dc568e9..f07500619a 100644
> --- a/sysdeps/powerpc/dl-procinfo.h
> +++ b/sysdeps/powerpc/dl-procinfo.h
> @@ -96,6 +96,7 @@ _dl_string_platform (const char *str)
>    if (str[1] == '0')
>      {
>        ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
> +      str++;
>      }
>    else
>      return -1;
>

LGTM.
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] powerpc: Fix POWER10 selection

Sourceware - libc-alpha mailing list
On 7/16/20 9:54 AM, Paul E Murphy via Libc-alpha wrote:

>
>
> On 7/15/20 6:04 PM, Tulio Magno Quites Machado Filho via Libc-alpha wrote:
>> Add a line that was missing from a previous commit.
>> Without increasing str, the null-byte is not validated, and
>> _dl_string_platform returns -1.
>>
>> Fixes: d2ba3677da7a ("powerpc: Add support for POWER10")
>> ---
>>   sysdeps/powerpc/dl-procinfo.h | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
>> index 497dc568e9..f07500619a 100644
>> --- a/sysdeps/powerpc/dl-procinfo.h
>> +++ b/sysdeps/powerpc/dl-procinfo.h
>> @@ -96,6 +96,7 @@ _dl_string_platform (const char *str)
>>         if (str[1] == '0')
>>           {
>>             ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER10;
>> +          str++;
>>           }
>>         else
>>           return -1;
>>
>
> LGTM.
>

Agreed, without str++ the subsequent str[1] == '\0' is false and
you return -1.

OK for 2.32.

Reviewed-by: Carlos O'Donell <[hidden email]>

--
Cheers,
Carlos.

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] powerpc: Fix POWER10 selection

Tulio Magno Quites Machado Filho-3
Carlos O'Donell via Libc-alpha <[hidden email]> writes:

> OK for 2.32.
>
> Reviewed-by: Carlos O'Donell <[hidden email]>

Pushed as f6add169c89bbdd139a2eb845686127ead5799cd.

Thanks!

--
Tulio Magno