From: Arnd Bergmann <arnd@kernel•org>
To: Linus Torvalds <torvalds@linux-foundation•org>,
Christoph Hellwig <hch@lst•de>,
linux-arch@vger•kernel.org, linux-mm@kvack•org,
linux-api@vger•kernel.org, arnd@arndb•de,
linux-kernel@vger•kernel.org, viro@zeniv•linux.org.uk
Cc: mark.rutland@arm•com, dalias@libc•org,
linux-ia64@vger•kernel.org, linux-sh@vger•kernel.org,
peterz@infradead•org, jcmvbkbc@gmail•com, guoren@kernel•org,
sparclinux@vger•kernel.org, linux-hexagon@vger•kernel.org,
linux-riscv@lists•infradead.org, will@kernel•org,
ardb@kernel•org, linux-s390@vger•kernel.org,
bcain@codeaurora•org, deller@gmx•de, x86@kernel•org,
linux@armlinux•org.uk, linux-csky@vger•kernel.org,
mingo@redhat•com, geert@linux-m68k•org,
linux-snps-arc@lists•infradead.org,
linux-xtensa@linux-xtensa•org, hca@linux•ibm.com,
linux-alpha@vger•kernel.org, linux-um@lists•infradead.org,
linux-m68k@lists•linux-m68k.org, openrisc@lists•librecores.org,
green.hu@gmail•com, shorne@gmail•com, monstr@monstr•eu,
tsbogend@alpha•franken.de, linux-parisc@vger•kernel.org,
nickhu@andestech•com, linux-mips@vger•kernel.org,
dinguyen@kernel•org, ebiederm@xmission•com, richard@nod•at,
akpm@linux-foundation•org, linuxppc-dev@lists•ozlabs.org,
davem@davemloft•net
Subject: [PATCH v2 07/18] nios2: drop access_ok() check from __put_user()
Date: Wed, 16 Feb 2022 14:13:21 +0100 [thread overview]
Message-ID: <20220216131332.1489939-8-arnd@kernel.org> (raw)
In-Reply-To: <20220216131332.1489939-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb•de>
Unlike other architectures, the nios2 version of __put_user() has an
extra check for access_ok(), preventing it from being used to implement
__put_kernel_nofault().
Split up put_user() along the same lines as __get_user()/get_user()
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
---
arch/nios2/include/asm/uaccess.h | 56 +++++++++++++++++++-------------
1 file changed, 33 insertions(+), 23 deletions(-)
diff --git a/arch/nios2/include/asm/uaccess.h b/arch/nios2/include/asm/uaccess.h
index ca9285a915ef..a5cbe07cf0da 100644
--- a/arch/nios2/include/asm/uaccess.h
+++ b/arch/nios2/include/asm/uaccess.h
@@ -167,34 +167,44 @@ do { \
: "r" (val), "r" (ptr), "i" (-EFAULT)); \
}
-#define put_user(x, ptr) \
+#define __put_user_common(__pu_val, __pu_ptr) \
({ \
long __pu_err = -EFAULT; \
- __typeof__(*(ptr)) __user *__pu_ptr = (ptr); \
- __typeof__(*(ptr)) __pu_val = (__typeof(*ptr))(x); \
- if (access_ok(__pu_ptr, sizeof(*__pu_ptr))) { \
- switch (sizeof(*__pu_ptr)) { \
- case 1: \
- __put_user_asm(__pu_val, "stb", __pu_ptr, __pu_err); \
- break; \
- case 2: \
- __put_user_asm(__pu_val, "sth", __pu_ptr, __pu_err); \
- break; \
- case 4: \
- __put_user_asm(__pu_val, "stw", __pu_ptr, __pu_err); \
- break; \
- default: \
- /* XXX: This looks wrong... */ \
- __pu_err = 0; \
- if (copy_to_user(__pu_ptr, &(__pu_val), \
- sizeof(*__pu_ptr))) \
- __pu_err = -EFAULT; \
- break; \
- } \
+ switch (sizeof(*__pu_ptr)) { \
+ case 1: \
+ __put_user_asm(__pu_val, "stb", __pu_ptr, __pu_err); \
+ break; \
+ case 2: \
+ __put_user_asm(__pu_val, "sth", __pu_ptr, __pu_err); \
+ break; \
+ case 4: \
+ __put_user_asm(__pu_val, "stw", __pu_ptr, __pu_err); \
+ break; \
+ default: \
+ /* XXX: This looks wrong... */ \
+ __pu_err = 0; \
+ if (__copy_to_user(__pu_ptr, &(__pu_val), \
+ sizeof(*__pu_ptr))) \
+ __pu_err = -EFAULT; \
+ break; \
} \
__pu_err; \
})
-#define __put_user(x, ptr) put_user(x, ptr)
+#define __put_user(x, ptr) \
+({ \
+ __auto_type __pu_ptr = (ptr); \
+ typeof(*__pu_ptr) __pu_val = (typeof(*__pu_ptr))(x); \
+ __put_user_common(__pu_val, __pu_ptr); \
+})
+
+#define put_user(x, ptr) \
+({ \
+ __auto_type __pu_ptr = (ptr); \
+ typeof(*__pu_ptr) __pu_val = (typeof(*__pu_ptr))(x); \
+ access_ok(__pu_ptr, sizeof(*__pu_ptr)) ? \
+ __put_user_common(__pu_val, __pu_ptr) : \
+ -EFAULT; \
+})
#endif /* _ASM_NIOS2_UACCESS_H */
--
2.29.2
next prev parent reply other threads:[~2022-02-16 13:20 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 13:13 [PATCH v2 00/18] clean up asm/uaccess.h, kill set_fs for good Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 01/18] uaccess: fix integer overflow on access_ok() Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 02/18] uaccess: fix nios2 and microblaze get_user_8() Arnd Bergmann
2022-02-16 13:35 ` David Laight
2022-02-18 6:25 ` Christoph Hellwig
2022-02-25 4:28 ` Dinh Nguyen
2022-02-16 13:13 ` [PATCH v2 03/18] nds32: fix access_ok() checks in get/put_user Arnd Bergmann
2022-02-18 6:25 ` Christoph Hellwig
2022-02-16 13:13 ` [PATCH v2 04/18] sparc64: add __{get,put}_kernel_nocheck() Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 05/18] x86: remove __range_not_ok() Arnd Bergmann
2022-02-18 6:28 ` Christoph Hellwig
2022-02-18 7:29 ` Arnd Bergmann
2022-02-18 15:45 ` David Laight
2022-02-16 13:13 ` [PATCH v2 06/18] x86: use more conventional access_ok() definition Arnd Bergmann
2022-02-18 6:29 ` Christoph Hellwig
2022-02-16 13:13 ` Arnd Bergmann [this message]
2022-02-18 6:29 ` [PATCH v2 07/18] nios2: drop access_ok() check from __put_user() Christoph Hellwig
2022-02-23 23:30 ` Dinh Nguyen
2022-02-24 7:05 ` Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 08/18] uaccess: add generic __{get,put}_kernel_nofault Arnd Bergmann
2022-02-18 6:30 ` Christoph Hellwig
2022-02-18 8:55 ` Geert Uytterhoeven
2022-02-16 13:13 ` [PATCH v2 09/18] mips: use simpler access_ok() Arnd Bergmann
2022-02-21 13:24 ` Thomas Bogendoerfer
2022-02-21 14:31 ` Arnd Bergmann
2022-02-21 15:21 ` Thomas Bogendoerfer
2022-02-22 16:36 ` Thomas Bogendoerfer
2022-02-23 20:05 ` Linus Torvalds
2022-02-23 7:41 ` Thomas Bogendoerfer
2022-02-23 9:26 ` Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 10/18] m68k: fix access_ok for coldfire Arnd Bergmann
2022-02-18 6:30 ` Christoph Hellwig
2022-02-18 9:00 ` Geert Uytterhoeven
2022-02-18 9:24 ` Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 11/18] arm64: simplify access_ok() Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 12/18] uaccess: fix type mismatch warnings from access_ok() Arnd Bergmann
2022-02-18 6:31 ` Christoph Hellwig
2022-02-25 4:30 ` Dinh Nguyen
2022-02-16 13:13 ` [PATCH v2 13/18] uaccess: generalize access_ok() Arnd Bergmann
2022-02-17 7:52 ` Arnd Bergmann
2022-02-17 19:15 ` Andy Lutomirski
2022-02-18 7:16 ` Arnd Bergmann
2022-02-18 9:30 ` David Laight
2022-02-18 18:07 ` Andy Lutomirski
2022-02-18 6:34 ` Christoph Hellwig
2022-02-18 7:23 ` Arnd Bergmann
2022-02-18 9:04 ` Geert Uytterhoeven
2022-02-24 8:29 ` Stafford Horne
2022-02-24 8:41 ` Arnd Bergmann
2022-02-25 4:31 ` Dinh Nguyen
2022-02-16 13:13 ` [PATCH v2 14/18] lib/test_lockup: fix kernel pointer check for separate address spaces Arnd Bergmann
2022-02-18 6:35 ` Christoph Hellwig
2022-02-18 7:15 ` Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 15/18] sparc64: remove CONFIG_SET_FS support Arnd Bergmann
2022-02-16 18:34 ` Sam Ravnborg
2022-02-16 18:41 ` Sam Ravnborg
2022-02-16 22:01 ` Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 16/18] sh: " Arnd Bergmann
2022-02-18 6:36 ` Christoph Hellwig
2022-02-16 13:13 ` [PATCH v2 17/18] ia64: " Arnd Bergmann
2022-02-16 13:13 ` [PATCH v2 18/18] uaccess: drop maining CONFIG_SET_FS users Arnd Bergmann
2022-02-16 18:44 ` Sam Ravnborg
2022-02-16 22:02 ` Arnd Bergmann
2022-02-17 22:36 ` Eric W. Biederman
2022-02-18 6:37 ` Christoph Hellwig
2022-02-18 7:10 ` Arnd Bergmann
2022-02-18 10:18 ` Sergey Matyukevich
2022-02-24 8:45 ` Stafford Horne
2022-02-25 4:33 ` Dinh Nguyen
2022-02-17 7:20 ` [PATCH v2 00/18] clean up asm/uaccess.h, kill set_fs for good Christophe Leroy
2022-02-17 7:49 ` Arnd Bergmann
2022-02-18 2:21 ` Al Viro
2022-02-18 9:20 ` Arnd Bergmann
2022-02-18 1:50 ` Al Viro
2022-02-18 10:01 ` Christophe Leroy
2022-02-17 8:13 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220216131332.1489939-8-arnd@kernel.org \
--to=arnd@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bcain@codeaurora$(echo .)org \
--cc=dalias@libc$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=deller@gmx$(echo .)de \
--cc=dinguyen@kernel$(echo .)org \
--cc=ebiederm@xmission$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=guoren@kernel$(echo .)org \
--cc=hca@linux$(echo .)ibm.com \
--cc=hch@lst$(echo .)de \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-api@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-hexagon@vger$(echo .)kernel.org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux-xtensa@linux-xtensa$(echo .)org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=nickhu@andestech$(echo .)com \
--cc=openrisc@lists$(echo .)librecores.org \
--cc=peterz@infradead$(echo .)org \
--cc=richard@nod$(echo .)at \
--cc=shorne@gmail$(echo .)com \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox