diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-23 00:15:05 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-23 00:15:05 +0300 |
| commit | fff5a5e7f528b2ed2c335991399a766c2cf01103 (patch) | |
| tree | 28289e23de807c471af2267ecd3f903dc657eb73 /arch | |
| parent | c13e02d335c825ffc7f4af3733329d38e695b482 (diff) | |
| parent | ceac10c83b330680cc01ceaaab86cd49f4f30d81 (diff) | |
| download | linux-fff5a5e7f528b2ed2c335991399a766c2cf01103.tar.xz | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Just one fix for now to eliminate a KASAN false positive"
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9290/1: uaccess: Fix KASAN false-positives
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/uaccess_with_memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 14eecaaf295f..e4c2677cc1e9 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -116,7 +116,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) tocopy = n; ua_flags = uaccess_save_and_enable(); - memcpy((void *)to, from, tocopy); + __memcpy((void *)to, from, tocopy); uaccess_restore(ua_flags); to += tocopy; from += tocopy; @@ -178,7 +178,7 @@ __clear_user_memset(void __user *addr, unsigned long n) tocopy = n; ua_flags = uaccess_save_and_enable(); - memset((void *)addr, 0, tocopy); + __memset((void *)addr, 0, tocopy); uaccess_restore(ua_flags); addr += tocopy; n -= tocopy; |