From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, james.morse@arm.com, hch@lst.de,
will@kernel.org, robin.murphy@arm.com
Subject: Re: [PATCHv3 12/17] arm64: uaccess: split user/kernel routines
Date: Mon, 2 Nov 2020 10:48:41 +0000 [thread overview]
Message-ID: <20201102104841.GD71783@C02TD0UTHF1T.local> (raw)
In-Reply-To: <20201026133156.44186-13-mark.rutland@arm.com>
On Mon, Oct 26, 2020 at 01:31:51PM +0000, Mark Rutland wrote:
> -#define __raw_get_mem(x, ptr, err) \
> +#define __raw_get_mem(ldr, x, ptr, err) \
> do { \
> unsigned long __gu_val; \
> __chk_user_ptr(ptr); \
> switch (sizeof(*(ptr))) { \
> case 1: \
> - __get_mem_asm("ldrb", "ldtrb", "%w", __gu_val, (ptr), \
> - (err), ARM64_HAS_UAO); \
> + __get_mem_asm(ldr "b", "%w", __gu_val, (ptr), (err)); \
> break; \
> case 2: \
> - __get_mem_asm("ldrh", "ldtrh", "%w", __gu_val, (ptr), \
> - (err), ARM64_HAS_UAO); \
> + __get_mem_asm(ldr "h", "%w", __gu_val, (ptr), (err)); \
> break; \
> case 4: \
> - __get_mem_asm("ldr", "ldtr", "%w", __gu_val, (ptr), \
> - (err), ARM64_HAS_UAO); \
> + __get_mem_asm(ldr, "%w", __gu_val, (ptr), (err)); \
> break; \
> case 8: \
> - __get_mem_asm("ldr", "ldtr", "%x", __gu_val, (ptr), \
> - (err), ARM64_HAS_UAO); \
> + __get_mem_asm(ldr, "%x", __gu_val, (ptr), (err)); \
> break; \
> default: \
> BUILD_BUG(); \
> @@ -298,7 +295,7 @@ do { \
> #define __raw_get_user(x, ptr, err) \
> do { \
> uaccess_enable_not_uao(); \
> - __raw_get_mem(x, ptr, err); \
> + __raw_get_mem("ldtr", x, ptr, err); \
> uaccess_disable_not_uao(); \
> } while (0)
>
> @@ -323,10 +320,19 @@ do { \
>
> #define get_user __get_user
>
> -#define __put_mem_asm(instr, alt_instr, reg, x, addr, err, feature) \
> +#define __get_kernel_nofault(dst, src, type, err_label) \
> +do { \
> + int __gkn_err; \
> + \
> + __raw_get_mem("ldr", *((type *)(dst)), \
> + (__force type __user *)(src), __gkn_err); \
> + if (unlikely(__gkn_err)) \
> + goto err_label; \
> +} while(0)
The `__gkn_err` variables needs to be initialized to zero to avoid
spurious errors being returned.
> @@ -366,7 +368,7 @@ do { \
> #define __raw_put_user(x, ptr, err) \
> do { \
> uaccess_enable_not_uao(); \
> - __raw_put_mem(x, ptr, err); \
> + __raw_put_mem("sttr", x, ptr, err); \
> uaccess_disable_not_uao(); \
> } while (0)
>
> @@ -391,6 +393,16 @@ do { \
>
> #define put_user __put_user
>
> +#define __put_kernel_nofault(dst, src, type, err_label) \
> +do { \
> + int __pkn_err; \
> + \
> + __raw_put_mem("str", *((type *)(src)), \
> + (__force type __user *)(dst), __pkn_err); \
> + if (unlikely(__pkn_err)) \
> + goto err_label; \
> +} while(0)
... and likewise here.
I've fixed both in my tree.
Mark.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-02 10:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 13:31 [PATCHv3 00/17] arm64: remove set_fs() and friends Mark Rutland
2020-10-26 13:31 ` [PATCHv3 01/17] arm64: ensure ERET from kthread is illegal Mark Rutland
2020-10-26 13:31 ` [PATCHv3 02/17] arm64: add C wrappers for SET_PSTATE_*() Mark Rutland
2020-10-26 13:31 ` [PATCHv3 03/17] arm64: head.S: rename el2_setup -> init_kernel_el Mark Rutland
2020-10-26 13:31 ` [PATCHv3 04/17] arm64: head.S: cleanup SCTLR_ELx initialization Mark Rutland
2020-10-26 13:31 ` [PATCHv3 05/17] arm64: head.S: always initialize PSTATE Mark Rutland
2020-10-26 13:31 ` [PATCHv3 06/17] arm64: sdei: move uaccess logic to arch/arm64/ Mark Rutland
2020-10-26 13:31 ` [PATCHv3 07/17] arm64: sdei: explicitly simulate PAN/UAO entry Mark Rutland
2020-10-26 13:31 ` [PATCHv3 08/17] arm64: uaccess: move uao_* alternatives to asm-uaccess.h Mark Rutland
2020-11-03 14:26 ` Will Deacon
2020-11-03 14:41 ` Mark Rutland
2020-10-26 13:31 ` [PATCHv3 09/17] arm64: uaccess: rename privileged uaccess routines Mark Rutland
2020-10-26 13:31 ` [PATCHv3 10/17] arm64: uaccess: simplify __copy_user_flushcache() Mark Rutland
2020-10-27 17:33 ` Robin Murphy
2020-11-02 10:14 ` Mark Rutland
2020-10-26 13:31 ` [PATCHv3 11/17] arm64: uaccess: refactor __{get,put}_user Mark Rutland
2020-10-27 18:03 ` Robin Murphy
2020-11-02 10:25 ` Mark Rutland
2020-10-26 13:31 ` [PATCHv3 12/17] arm64: uaccess: split user/kernel routines Mark Rutland
2020-11-02 10:48 ` Mark Rutland [this message]
2020-10-26 13:31 ` [PATCHv3 13/17] arm64: uaccess cleanup macro naming Mark Rutland
2020-10-27 18:45 ` Robin Murphy
2020-11-02 10:35 ` Mark Rutland
2020-10-26 13:31 ` [PATCHv3 14/17] arm64: uaccess: remove set_fs() Mark Rutland
2020-10-26 13:31 ` [PATCHv3 15/17] arm64: uaccess: remove addr_limit_user_check() Mark Rutland
2020-10-26 13:31 ` [PATCHv3 16/17] arm64: uaccess: remove redundant PAN toggling Mark Rutland
2020-10-26 13:31 ` [PATCHv3 17/17] arm64: uaccess: remove vestigal UAO support Mark Rutland
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=20201102104841.GD71783@C02TD0UTHF1T.local \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=hch@lst.de \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.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