[PATCH] asm-generic: Fix 32 bit __generic_cmpxchg_local

Stuart Menefy posted 1 patch 1 year, 11 months ago
include/asm-generic/cmpxchg-local.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] asm-generic: Fix 32 bit __generic_cmpxchg_local
Posted by Stuart Menefy 1 year, 11 months ago
From: David McKay <david.mckay@codasip.com>

Commit 656e9007ef58 ("asm-generic: avoid __generic_cmpxchg_local
warnings") introduced a typo that means the code is incorrect for 32 bit
values. It will work fine for postive numbers, but will fail for
negative numbers on a system where longs are 64 bit.

Fixes: 656e9007ef58 ("asm-generic: avoid __generic_cmpxchg_local warnings")
Signed-off-by: David McKay <david.mckay@codasip.com>
Signed-off-by: Stuart Menefy <stuart.menefy@codasip.com>
---
 include/asm-generic/cmpxchg-local.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index 3df9f59a544e..f27d66fdc00a 100644
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -34,7 +34,7 @@ static inline unsigned long __generic_cmpxchg_local(volatile void *ptr,
 			*(u16 *)ptr = (new & 0xffffu);
 		break;
 	case 4: prev = *(u32 *)ptr;
-		if (prev == (old & 0xffffffffffu))
+		if (prev == (old & 0xffffffffu))
 			*(u32 *)ptr = (new & 0xffffffffu);
 		break;
 	case 8: prev = *(u64 *)ptr;
-- 
2.39.3
Re: [PATCH] asm-generic: Fix 32 bit __generic_cmpxchg_local
Posted by Arnd Bergmann 1 year, 11 months ago
On Thu, Jan 4, 2024, at 10:40, Stuart Menefy wrote:
> From: David McKay <david.mckay@codasip.com>
>
> Commit 656e9007ef58 ("asm-generic: avoid __generic_cmpxchg_local
> warnings") introduced a typo that means the code is incorrect for 32 bit
> values. It will work fine for postive numbers, but will fail for
> negative numbers on a system where longs are 64 bit.
>
> Fixes: 656e9007ef58 ("asm-generic: avoid __generic_cmpxchg_local warnings")
> Signed-off-by: David McKay <david.mckay@codasip.com>
> Signed-off-by: Stuart Menefy <stuart.menefy@codasip.com>

Applied to the asm-generic tree, thanks a lot!

      arnd