[v2,1/2] arm: remove string/tst-memmove-overflow XFAIL

Message ID 20200713212347.385792-1-aurelien@aurel32.net
State Committed
Headers
Series [v2,1/2] arm: remove string/tst-memmove-overflow XFAIL |

Commit Message

Aurelien Jarno July 13, 2020, 9:23 p.m. UTC
  The arm string/tst-memmove-overflow XFAIL has been added in commit
eca1b233322 ("arm: XFAIL string/tst-memmove-overflow due to bug 25620")
as a way to reproduce the reported bug.

Now that this bug has been fixed in commits 79a4fa341b8 ("arm:
CVE-2020-6096: fix memcpy and memmove for negative length [BZ #25620]")
and beea3610507 ("arm: CVE-2020-6096: Fix multiarch memcpy for negative
length [BZ #25620]"), let's remove the XFAIL.
---
 sysdeps/arm/Makefile | 5 -----
 1 file changed, 5 deletions(-)
  

Comments

Carlos O'Donell July 15, 2020, 8:51 p.m. UTC | #1
On 7/13/20 5:23 PM, Aurelien Jarno wrote:
> The arm string/tst-memmove-overflow XFAIL has been added in commit
> eca1b233322 ("arm: XFAIL string/tst-memmove-overflow due to bug 25620")
> as a way to reproduce the reported bug.
> 
> Now that this bug has been fixed in commits 79a4fa341b8 ("arm:
> CVE-2020-6096: fix memcpy and memmove for negative length [BZ #25620]")
> and beea3610507 ("arm: CVE-2020-6096: Fix multiarch memcpy for negative
> length [BZ #25620]"), let's remove the XFAIL.

OK for 2.32.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  sysdeps/arm/Makefile | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
> index a0cb7f3c32e..ad2042b93a1 100644
> --- a/sysdeps/arm/Makefile
> +++ b/sysdeps/arm/Makefile
> @@ -68,8 +68,3 @@ ifeq ($(subdir),nptl)
>  libpthread-sysdep_routines += pt-arm-unwind-resume
>  libpthread-shared-only-routines += pt-arm-unwind-resume
>  endif
> -
> -ifeq ($(subdir),string)
> -# This test fails on arm due to bug 25620 and related issues.
> -test-xfail-tst-memmove-overflow = yes
> -endif
>
  

Patch

diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
index a0cb7f3c32e..ad2042b93a1 100644
--- a/sysdeps/arm/Makefile
+++ b/sysdeps/arm/Makefile
@@ -68,8 +68,3 @@  ifeq ($(subdir),nptl)
 libpthread-sysdep_routines += pt-arm-unwind-resume
 libpthread-shared-only-routines += pt-arm-unwind-resume
 endif
-
-ifeq ($(subdir),string)
-# This test fails on arm due to bug 25620 and related issues.
-test-xfail-tst-memmove-overflow = yes
-endif