korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 14:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

locking/atomic: cmpxchg: Make __generic_cmpxchg_local compare against zero-extended 'old' value

Browse Source 
__generic_cmpxchg_local takes unsigned long old/new arguments which
might end up being up-cast from smaller signed types (which will
sign-extend).  The loaded compare value must be compared against a
truncated smaller type, so down-cast appropriately for each size.

The issue is apparent on 64-bit machines with code, such as
atomic_dec_unless_positive(), that sign-extends from int.

64-bit machines generally don't use the generic cmpxchg but
development/early ports might make use of it, so make it correct.

Signed-off-by: Matt Evans <mev@rivosinc.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Matt Evans 2023-02-01 18:39:48 +00:00 committed by Arnd Bergmann
parent 88603b6dc4
commit 6246541522
No known key found for this signature in database
GPG Key ID: 9A6C79EFE60018D9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-generic/cmpxchg-local.h
View File

@ -26,15 +26,15 @@ static inline unsigned long __generic_cmpxchg_local(volatile void *ptr,
raw_local_irq_save(flags); raw_local_irq_save(flags);
switch (size) { switch (size) {
case 1: prev = *(u8 *)ptr; case 1: prev = *(u8 *)ptr;
if (prev == old) if (prev == (u8)old)
*(u8 *)ptr = (u8)new; *(u8 *)ptr = (u8)new;
break; break;
case 2: prev = *(u16 *)ptr; case 2: prev = *(u16 *)ptr;
if (prev == old) if (prev == (u16)old)
*(u16 *)ptr = (u16)new; *(u16 *)ptr = (u16)new;
break; break;
case 4: prev = *(u32 *)ptr; case 4: prev = *(u32 *)ptr;
if (prev == old) if (prev == (u32)old)
*(u32 *)ptr = (u32)new; *(u32 *)ptr = (u32)new;
break; break;
case 8: prev = *(u64 *)ptr; case 8: prev = *(u64 *)ptr;