[PATCH v14 1/4] asm-generic,arm64: create task variant of access_ok

Catalin Marinas catalin.marinas at arm.com
Wed Mar 29 09:22:49 PDT 2023


On Tue, Mar 28, 2023 at 12:48:08PM -0400, Gregory Price wrote:
> diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
> index 5c7b2f9d5913..1a51a54f264f 100644
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@ -35,7 +35,9 @@ static inline int __access_ok(const void __user *ptr, unsigned long size);
>   * This is equivalent to the following test:
>   * (u65)addr + (u65)size <= (u65)TASK_SIZE_MAX
>   */
> -static inline int access_ok(const void __user *addr, unsigned long size)
> +static inline int task_access_ok(struct task_struct *task,
> +				 const void __user *addr,
> +				 unsigned long size)
>  {
>  	/*
>  	 * Asynchronous I/O running in a kernel thread does not have the
> @@ -43,11 +45,18 @@ static inline int access_ok(const void __user *addr, unsigned long size)
>  	 * the user address before checking.
>  	 */
>  	if (IS_ENABLED(CONFIG_ARM64_TAGGED_ADDR_ABI) &&
> -	    (current->flags & PF_KTHREAD || test_thread_flag(TIF_TAGGED_ADDR)))
> +	    (task->flags & PF_KTHREAD || test_ti_thread_flag(task, TIF_TAGGED_ADDR)))
>  		addr = untagged_addr(addr);
>  
>  	return likely(__access_ok(addr, size));
>  }
> +
> +static inline int access_ok(const void __user *addr, unsigned long size)
> +{
> +	return task_access_ok(current, addr, size);
> +}
> +
> +#define task_access_ok task_access_ok

I'd not bother with this at all. In the generic code you can either do
an __access_ok() check directly or just
access_ok(untagged_addr(selector), ...) with a comment that address
tagging of the ptraced task may not be enabled.

-- 
Catalin



More information about the linux-arm-kernel mailing list