diff mbox series

Fix stringop-overflow warning in tst-strlcat2.

Message ID 20240116084430.1082389-1-stli@linux.ibm.com
State Committed
Commit ab0db3b8849a3d4e56e30d50bc019666532b1299
Headers
Series Fix stringop-overflow warning in tst-strlcat2. |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Stefan Liebler Jan. 16, 2024, 8:44 a.m. UTC 
  On s390x, I get warnings like this when do_one_test is inlined with SIZE_MAX:
In function ‘do_one_test’,
    inlined from ‘do_overflow_tests’ at tst-strlcat2.c:184:2:
tst-strlcat2.c:49:18: error: ‘strnlen’ specified bound [18446744073709550866, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
   49 | # define STRNLEN strnlen
      |                  ^
tst-strlcat2.c:89:23: note: in expansion of macro ‘STRNLEN’
   89 |   size_t dst_length = STRNLEN (dst, n);
      |                       ^~~~~~~

This patch just marks the do_one_test function as noinline as also done in test-strncat.c:
Fix stringop-overflow warning in test-strncat.
https://sourceware.org/git/?p=glibc.git;a=commit;h=51aeab9a363a0d000d0912aa3d6490463a26fba2
---
 string/tst-strlcat2.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Stefan Liebler Feb. 5, 2024, 1:28 p.m. UTC | #1 
ping
On 16.01.24 09:44, Stefan Liebler wrote:
> On s390x, I get warnings like this when do_one_test is inlined with SIZE_MAX:
> In function ‘do_one_test’,
>     inlined from ‘do_overflow_tests’ at tst-strlcat2.c:184:2:
> tst-strlcat2.c:49:18: error: ‘strnlen’ specified bound [18446744073709550866, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
>    49 | # define STRNLEN strnlen
>       |                  ^
> tst-strlcat2.c:89:23: note: in expansion of macro ‘STRNLEN’
>    89 |   size_t dst_length = STRNLEN (dst, n);
>       |                       ^~~~~~~
> 
> This patch just marks the do_one_test function as noinline as also done in test-strncat.c:
> Fix stringop-overflow warning in test-strncat.
> https://sourceware.org/git/?p=glibc.git;a=commit;h=51aeab9a363a0d000d0912aa3d6490463a26fba2
> ---
>  string/tst-strlcat2.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/string/tst-strlcat2.c b/string/tst-strlcat2.c
> index 225520a46b..1ec26a2432 100644
> --- a/string/tst-strlcat2.c
> +++ b/string/tst-strlcat2.c
> @@ -81,6 +81,7 @@ IMPL (STRLCAT, 1)
>  typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t);
>  
>  static void
> +__attribute__((noinline))
>  do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
>  	     size_t n)
>  {
Stefan Liebler Feb. 5, 2024, 1:29 p.m. UTC | #2 
ping
On 16.01.24 09:44, Stefan Liebler wrote:
> On s390x, I get warnings like this when do_one_test is inlined with SIZE_MAX:
> In function ‘do_one_test’,
>     inlined from ‘do_overflow_tests’ at tst-strlcat2.c:184:2:
> tst-strlcat2.c:49:18: error: ‘strnlen’ specified bound [18446744073709550866, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
>    49 | # define STRNLEN strnlen
>       |                  ^
> tst-strlcat2.c:89:23: note: in expansion of macro ‘STRNLEN’
>    89 |   size_t dst_length = STRNLEN (dst, n);
>       |                       ^~~~~~~
> 
> This patch just marks the do_one_test function as noinline as also done in test-strncat.c:
> Fix stringop-overflow warning in test-strncat.
> https://sourceware.org/git/?p=glibc.git;a=commit;h=51aeab9a363a0d000d0912aa3d6490463a26fba2
> ---
>  string/tst-strlcat2.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/string/tst-strlcat2.c b/string/tst-strlcat2.c
> index 225520a46b..1ec26a2432 100644
> --- a/string/tst-strlcat2.c
> +++ b/string/tst-strlcat2.c
> @@ -81,6 +81,7 @@ IMPL (STRLCAT, 1)
>  typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t);
>  
>  static void
> +__attribute__((noinline))
>  do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
>  	     size_t n)
>  {
Adhemerval Zanella Netto Feb. 5, 2024, 1:53 p.m. UTC | #3 
On 16/01/24 05:44, Stefan Liebler wrote:
> On s390x, I get warnings like this when do_one_test is inlined with SIZE_MAX:
> In function ‘do_one_test’,
>     inlined from ‘do_overflow_tests’ at tst-strlcat2.c:184:2:
> tst-strlcat2.c:49:18: error: ‘strnlen’ specified bound [18446744073709550866, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
>    49 | # define STRNLEN strnlen
>       |                  ^
> tst-strlcat2.c:89:23: note: in expansion of macro ‘STRNLEN’
>    89 |   size_t dst_length = STRNLEN (dst, n);
>       |                       ^~~~~~~
> 
> This patch just marks the do_one_test function as noinline as also done in test-strncat.c:
> Fix stringop-overflow warning in test-strncat.
> https://sourceware.org/git/?p=glibc.git;a=commit;h=51aeab9a363a0d000d0912aa3d6490463a26fba2

LGTM, although I am not seeing this failure with gcc 13.2.1 on x86_64
nor on s390x (building with -Os).

> ---
>  string/tst-strlcat2.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/string/tst-strlcat2.c b/string/tst-strlcat2.c
> index 225520a46b..1ec26a2432 100644
> --- a/string/tst-strlcat2.c
> +++ b/string/tst-strlcat2.c
> @@ -81,6 +81,7 @@ IMPL (STRLCAT, 1)
>  typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t);
>  
>  static void
> +__attribute__((noinline))
>  do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
>  	     size_t n)
>  {
Stefan Liebler Feb. 5, 2024, 2:15 p.m. UTC | #4 
On 05.02.24 14:53, Adhemerval Zanella Netto wrote:
> 
> 
> On 16/01/24 05:44, Stefan Liebler wrote:
>> On s390x, I get warnings like this when do_one_test is inlined with SIZE_MAX:
>> In function ‘do_one_test’,
>>     inlined from ‘do_overflow_tests’ at tst-strlcat2.c:184:2:
>> tst-strlcat2.c:49:18: error: ‘strnlen’ specified bound [18446744073709550866, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
>>    49 | # define STRNLEN strnlen
>>       |                  ^
>> tst-strlcat2.c:89:23: note: in expansion of macro ‘STRNLEN’
>>    89 |   size_t dst_length = STRNLEN (dst, n);
>>       |                       ^~~~~~~
>>
>> This patch just marks the do_one_test function as noinline as also done in test-strncat.c:
>> Fix stringop-overflow warning in test-strncat.
>> https://sourceware.org/git/?p=glibc.git;a=commit;h=51aeab9a363a0d000d0912aa3d6490463a26fba2
> 
> LGTM, although I am not seeing this failure with gcc 13.2.1 on x86_64
> nor on s390x (building with -Os).
> 

Thanks and committed.
Yes, you are right. The recent gcc's on s390x does not inline so much as
with older versions. If I remember correctly, starting with gcc 10,
inlining was reduced (for s390x).
diff mbox series

Patch

diff --git a/string/tst-strlcat2.c b/string/tst-strlcat2.c
index 225520a46b..1ec26a2432 100644
--- a/string/tst-strlcat2.c
+++ b/string/tst-strlcat2.c
@@ -81,6 +81,7 @@  IMPL (STRLCAT, 1)
 typedef size_t (*proto_t) (CHAR *, const CHAR *, size_t);
 
 static void
+__attribute__((noinline))
 do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
 	     size_t n)
 {