From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v1 09/15] powerpc/uaccess: Remove calls to __get_user_bad() and __put_user_bad()
Date: Thu, 25 Feb 2021 17:50:39 +0000 (UTC) [thread overview]
Message-ID: <129ae74443042123ca249216484b12a534568d51.1614275314.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1614275314.git.christophe.leroy@csgroup.eu>
__get_user_bad() and __put_user_bad() are functions that are
declared but not defined, in order to make the build fails in
case they are called.
Nowadays, we have BUILD_BUG() and BUILD_BUG_ON() for that.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/uaccess.h | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index a9f2639ca3a8..a8c683695ec7 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -53,8 +53,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size)
#define __put_user(x, ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
-extern long __put_user_bad(void);
-
#define __put_user_size(x, ptr, size, retval) \
do { \
__label__ __pu_failed; \
@@ -136,12 +134,10 @@ do { \
case 2: __put_user_asm_goto(x, __pus_addr, label, "sth"); break; \
case 4: __put_user_asm_goto(x, __pus_addr, label, "stw"); break; \
case 8: __put_user_asm2_goto(x, __pus_addr, label); break; \
- default: __put_user_bad(); \
+ default: BUILD_BUG(); \
} \
} while (0)
-extern long __get_user_bad(void);
-
/*
* This does an atomic 128 byte aligned load from userspace.
* Upto caller to do enable_kernel_vmx() before calling!
@@ -196,14 +192,13 @@ extern long __get_user_bad(void);
#define __get_user_size_allowed(x, ptr, size, retval) \
do { \
retval = 0; \
- if (size > sizeof(x)) \
- (x) = __get_user_bad(); \
+ BUILD_BUG_ON(size > sizeof(x)); \
switch (size) { \
case 1: __get_user_asm(x, (u8 __user *)ptr, retval, "lbz"); break; \
case 2: __get_user_asm(x, (u16 __user *)ptr, retval, "lhz"); break; \
case 4: __get_user_asm(x, (u32 __user *)ptr, retval, "lwz"); break; \
case 8: __get_user_asm2(x, (u64 __user *)ptr, retval); break; \
- default: (x) = __get_user_bad(); \
+ default: BUILD_BUG(); \
} \
} while (0)
--
2.25.0
next prev parent reply other threads:[~2021-02-25 17:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 17:50 [PATCH v1 00/15] powerpc: Cleanup of uaccess.h Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 01/15] powerpc/uaccess: Remove __get_user_allowed() and unsafe_op_wrap() Christophe Leroy
2021-03-01 22:02 ` Daniel Axtens
2021-03-01 22:31 ` Segher Boessenkool
2021-03-10 8:14 ` Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 02/15] powerpc/uaccess: Define ___get_user_instr() for ppc32 Christophe Leroy
2021-03-01 22:20 ` Daniel Axtens
2021-02-25 17:50 ` [PATCH v1 03/15] powerpc/uaccess: Remove __get/put_user_inatomic() Christophe Leroy
2021-03-01 22:42 ` Daniel Axtens
2021-03-10 8:03 ` Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 04/15] powerpc/uaccess: Move get_user_instr helpers in asm/inst.h Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 05/15] powerpc/align: Don't use __get_user_instr() on kernel addresses Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 06/15] powerpc/uaccess: Call might_fault() inconditionaly Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 07/15] powerpc/uaccess: Remove __unsafe_put_user_goto() Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 08/15] powerpc/uaccess: Remove __chk_user_ptr() in __get/put_user Christophe Leroy
2021-02-25 17:50 ` Christophe Leroy [this message]
2021-02-25 17:50 ` [PATCH v1 10/15] powerpc/uaccess: Split out __get_user_nocheck() Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 11/15] powerpc/uaccess: Rename __get/put_user_check/nocheck Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 12/15] powerpc/uaccess: Refactor get/put_user() and __get/put_user() Christophe Leroy
2021-03-07 10:23 ` kernel test robot
2021-03-08 12:14 ` Christophe Leroy
2021-03-08 14:43 ` Christian König
2021-02-25 17:50 ` [PATCH v1 13/15] powerpc/uaccess: Swap clear_user() and __clear_user() Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 14/15] powerpc/uaccess: Also perform 64 bits copies in unsafe_copy_to_user() on ppc32 Christophe Leroy
2021-02-25 17:50 ` [PATCH v1 15/15] powerpc/uaccess: Move copy_mc_xxx() functions down Christophe Leroy
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=129ae74443042123ca249216484b12a534568d51.1614275314.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).