On 31/01/2023 12:25, Beata Michalska wrote:
On Mon, Dec 12, 2022 at 10:35:37AM +0000, Kevin Brodsky wrote:
The removal of set_fs() is now firmly established and there should
We could actually mention the exact commit that removed support for CONFIG_SET_FS ? 967747bbc084 : uaccess: remove CONFIG_SET_FS
Right the way I thought about it was that it happened over a certain period of time, but indeed it's worth mentioning the final commit, will add that.
Kevin
BR B.
therefore be no need to create user pointers from kernel addresses any more. This means we can get rid of kaddr_to_user_ptr(), which is unused.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com
Documentation/core-api/user_ptr.rst | 8 -------- arch/arm64/include/asm/user_ptr.h | 8 -------- include/linux/user_ptr.h | 16 ---------------- 3 files changed, 32 deletions(-)
diff --git a/Documentation/core-api/user_ptr.rst b/Documentation/core-api/user_ptr.rst index 21e02d4bd11b..925d22df2b9d 100644 --- a/Documentation/core-api/user_ptr.rst +++ b/Documentation/core-api/user_ptr.rst @@ -97,7 +97,6 @@ Each function covers a particular category of input integer:
- User-provided user address: ``uaddr_to_user_ptr()``
- Kernel-controlled user address: ``uaddr_to_user_ptr_safe()``
- Kernel address: ``kaddr_to_user_ptr()``
- **Compat pointer**: ``compat_ptr()``
@@ -130,13 +129,6 @@ derived from in the PCuABI case. | | user address | mappings during | | kernel needs to access user memory using a bare | | | | process initialisation | | virtual address that is not provided by userspace. | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ -| ``kaddr_to_user_ptr()`` | Kernel address | [None currently] | Kernel root capability | There used to be a number of situations where kernel | -| | | | | memory was accessed through uaccess, requiring user | -| | | | | pointers to be created out of kernel addresses. | -| | | | | This should no longer be the case and this function | -| | | | | will be removed once it is confirmed that there is | -| | | | | no use-case left. | -+------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ | ``compat_ptr()`` | Compat pointer | Pointer in a | Current user DDC | Must be used whenever converting a compat user | | | | user-provided | | pointer to a native user pointer. | | | | ``compat_*`` struct | | | diff --git a/arch/arm64/include/asm/user_ptr.h b/arch/arm64/include/asm/user_ptr.h index 745e7d34f25b..323ad0301cbd 100644 --- a/arch/arm64/include/asm/user_ptr.h +++ b/arch/arm64/include/asm/user_ptr.h @@ -30,14 +30,6 @@ static inline void __user *uaddr_to_user_ptr_safe(ptraddr_t addr) } #define uaddr_to_user_ptr_safe(addr) uaddr_to_user_ptr_safe(addr) -static inline void __user *kaddr_to_user_ptr(ptraddr_t addr) -{
- uintcap_t root_cap = morello_get_root_cap();
- return (void __user *)__builtin_cheri_address_set(root_cap, addr);
-} -#define kaddr_to_user_ptr(addr) kaddr_to_user_ptr(addr)
#endif /* CONFIG_CHERI_PURECAP_UABI */ #endif /* __ASM_USER_PTR_H */ diff --git a/include/linux/user_ptr.h b/include/linux/user_ptr.h index 0942b58cfb6a..e2de3464bcf8 100644 --- a/include/linux/user_ptr.h +++ b/include/linux/user_ptr.h @@ -65,22 +65,6 @@ static inline void __user *uaddr_to_user_ptr_safe(ptraddr_t addr) } #endif -#ifndef kaddr_to_user_ptr -/**
- kaddr_to_user_ptr - convert a kernel address to a user pointer
- @addr: the address to set the pointer to
- Returns a user pointer with its address set to @addr.
- This function should be used when kernel memory needs to be accessed via a
- user pointer. There should be no use for it after the removal of set_fs().
- */
-static inline void __user *kaddr_to_user_ptr(ptraddr_t addr) -{
- return as_user_ptr(addr);
-} -#endif
/**
- user_ptr_addr - extract the address of a user pointer
- @ptr: the user pointer to extract the address from
-- 2.38.1
linux-morello mailing list -- linux-morello@op-lists.linaro.org To unsubscribe send an email to linux-morello-leave@op-lists.linaro.org