lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 16 Feb 2022 14:13:17 +0100 From: Arnd Bergmann <arnd@...nel.org> To: Linus Torvalds <torvalds@...ux-foundation.org>, Christoph Hellwig <hch@....de>, linux-arch@...r.kernel.org, linux-mm@...ck.org, linux-api@...r.kernel.org, arnd@...db.de, linux-kernel@...r.kernel.org, viro@...iv.linux.org.uk Cc: linux@...linux.org.uk, will@...nel.org, guoren@...nel.org, bcain@...eaurora.org, geert@...ux-m68k.org, monstr@...str.eu, tsbogend@...ha.franken.de, nickhu@...estech.com, green.hu@...il.com, dinguyen@...nel.org, shorne@...il.com, deller@....de, mpe@...erman.id.au, peterz@...radead.org, mingo@...hat.com, mark.rutland@....com, hca@...ux.ibm.com, dalias@...c.org, davem@...emloft.net, richard@....at, x86@...nel.org, jcmvbkbc@...il.com, ebiederm@...ssion.com, akpm@...ux-foundation.org, ardb@...nel.org, linux-alpha@...r.kernel.org, linux-snps-arc@...ts.infradead.org, linux-csky@...r.kernel.org, linux-hexagon@...r.kernel.org, linux-ia64@...r.kernel.org, linux-m68k@...ts.linux-m68k.org, linux-mips@...r.kernel.org, openrisc@...ts.librecores.org, linux-parisc@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org, linux-riscv@...ts.infradead.org, linux-s390@...r.kernel.org, linux-sh@...r.kernel.org, sparclinux@...r.kernel.org, linux-um@...ts.infradead.org, linux-xtensa@...ux-xtensa.org, stable@...r.kernel.org Subject: [PATCH v2 03/18] nds32: fix access_ok() checks in get/put_user From: Arnd Bergmann <arnd@...db.de> The get_user()/put_user() functions are meant to check for access_ok(), while the __get_user()/__put_user() functions don't. This broke in 4.19 for nds32, when it gained an extraneous check in __get_user(), but lost the check it needs in __put_user(). Fixes: 487913ab18c2 ("nds32: Extract the checking and getting pointer to a macro") Cc: stable@...r.kernel.org @ v4.19+ Signed-off-by: Arnd Bergmann <arnd@...db.de> --- arch/nds32/include/asm/uaccess.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/nds32/include/asm/uaccess.h b/arch/nds32/include/asm/uaccess.h index d4cbf069dc22..37a40981deb3 100644 --- a/arch/nds32/include/asm/uaccess.h +++ b/arch/nds32/include/asm/uaccess.h @@ -70,9 +70,7 @@ static inline void set_fs(mm_segment_t fs) * versions are void (ie, don't return a value as such). */ -#define get_user __get_user \ - -#define __get_user(x, ptr) \ +#define get_user(x, ptr) \ ({ \ long __gu_err = 0; \ __get_user_check((x), (ptr), __gu_err); \ @@ -85,6 +83,14 @@ static inline void set_fs(mm_segment_t fs) (void)0; \ }) +#define __get_user(x, ptr) \ +({ \ + long __gu_err = 0; \ + const __typeof__(*(ptr)) __user *__p = (ptr); \ + __get_user_err((x), __p, (__gu_err)); \ + __gu_err; \ +}) + #define __get_user_check(x, ptr, err) \ ({ \ const __typeof__(*(ptr)) __user *__p = (ptr); \ @@ -165,12 +171,18 @@ do { \ : "r"(addr), "i"(-EFAULT) \ : "cc") -#define put_user __put_user \ +#define put_user(x, ptr) \ +({ \ + long __pu_err = 0; \ + __put_user_check((x), (ptr), __pu_err); \ + __pu_err; \ +}) #define __put_user(x, ptr) \ ({ \ long __pu_err = 0; \ - __put_user_err((x), (ptr), __pu_err); \ + __typeof__(*(ptr)) __user *__p = (ptr); \ + __put_user_err((x), __p, __pu_err); \ __pu_err; \ }) -- 2.29.2
Powered by blists - more mailing lists