Google Git
Sign in
kernel / pub / scm / linux / kernel / git / arnd / playground / refs/heads/asm-generic-uaccess-5^! / .
commit519555fc5dfcbb3f6aad52df8673b5110ec8652f[log] [tgz]
authorArnd Bergmann <arnd@arndb.de>Mon May 17 09:22:34 2021 +0200
committerArnd Bergmann <arnd@arndb.de>Thu Jul 22 10:08:50 2021 +0200
treef6eb1144e92ef22e6dfac8d34dba8b12a6e7e351
parent68a1d6508b56b6a386a6b8647ff4454e9ffae6eb [diff]
asm-generic: reverse GENERIC_{STRNCPY_FROM,STRNLEN}_USER symbols

Most architectures do not need a custom implementation, and in most
cases the generic implementation is preferred, so change the polariy
on these Kconfig symbols to require architectures to select them when
they provide their own version.

The new name is CONFIG_ARCH_HAS_{STRNCPY_FROM,STRNLEN}_USER.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 77d3280..62935da 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig

@@ -29,8 +29,6 @@
 	select AUDIT_ARCH
 	select GENERIC_CPU_VULNERABILITIES
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_MOD_ARCH_SPECIFIC
 	select MODULES_USE_ELF_RELA

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 64e5f93..d8f51eb 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig

@@ -27,8 +27,6 @@
 	select GENERIC_PENDING_IRQ if SMP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if ARC_MMU_V4

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 82f908f..e8ebbb9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig

@@ -63,8 +63,6 @@
 	select GENERIC_PCI_IOMAP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HANDLE_DOMAIN_IRQ
 	select HARDIRQS_SW_RESEND
 	select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b5b13a9..e0c6c14 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig

@@ -130,8 +130,6 @@
 	select GENERIC_PTDUMP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select GENERIC_GETTIMEOFDAY
 	select GENERIC_VDSO_TIME_NS

diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
index 2716f63..a48a320 100644
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig

@@ -4,6 +4,8 @@
 	select ARCH_32BIT_OFF_T
 	select ARCH_HAS_DMA_PREP_COHERENT
 	select ARCH_HAS_GCOV_PROFILE_ALL
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_HAS_SYNC_DMA_FOR_CPU
 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 	select ARCH_USE_BUILTIN_BSWAP

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 53dfd2d..3e3e0f1 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig

@@ -11,8 +11,6 @@
 	select GENERIC_IRQ_SHOW
 	select FRAME_POINTER
 	select GENERIC_CPU_DEVICES
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select MODULES_USE_ELF_RELA
 	select COMMON_CLK
 	select ARCH_WANT_FRAME_POINTERS

diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 3bf4845..e5a8520 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig

@@ -19,8 +19,6 @@
 	# GENERIC_ALLOCATOR is used by dma_alloc_coherent()
 	select GENERIC_ALLOCATOR
 	select GENERIC_IRQ_SHOW
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_TRACEHOOK
 	select NEED_SG_DMA_LENGTH

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index cf425c2..7aa5b94 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig

@@ -9,6 +9,8 @@
 config IA64
 	bool
 	select ARCH_HAS_DMA_MARK_CLEAN
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 	select ARCH_MIGHT_HAVE_PC_SERIO
 	select ACPI

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 37a65be..7970d31 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig

@@ -16,8 +16,6 @@
 	select GENERIC_CPU_DEVICES
 	select GENERIC_IOMAP
 	select GENERIC_IRQ_SHOW
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HAVE_AOUT if MMU
 	select HAVE_ASM_MODVERSIONS
 	select HAVE_DEBUG_BUGVERBOSE

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 14a67a4..402d341 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig

@@ -5,6 +5,8 @@
 	select ARCH_NO_SWAP
 	select ARCH_HAS_DMA_PREP_COHERENT
 	select ARCH_HAS_GCOV_PROFILE_ALL
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_HAS_SYNC_DMA_FOR_CPU
 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 	select ARCH_MIGHT_HAVE_PC_PARPORT

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cee6087..22aa4d7 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig

@@ -12,6 +12,8 @@
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 	select ARCH_HAS_GCOV_PROFILE_ALL
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_KEEP_MEMBLOCK
 	select ARCH_SUPPORTS_UPROBES
 	select ARCH_USE_BUILTIN_BSWAP

diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index 6231390..9c9f387 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig

@@ -26,8 +26,6 @@
 	select GENERIC_LIB_LSHRDI3
 	select GENERIC_LIB_MULDI3
 	select GENERIC_LIB_UCMPDI2
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select HANDLE_DOMAIN_IRQ
 	select HAVE_ARCH_TRACEHOOK

diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index c24955c..3efe553 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig

@@ -13,8 +13,6 @@
 	select GENERIC_CPU_DEVICES
 	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_KGDB
 	select IRQ_DOMAIN

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 591acc59..50035a9 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig

@@ -25,8 +25,6 @@
 	select HAVE_UID16
 	select GENERIC_ATOMIC64
 	select GENERIC_CLOCKEVENTS_BROADCAST
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_SMP_IDLE_THREAD
 	select MODULES_USE_ELF_RELA
 	select HAVE_DEBUG_STACKOVERFLOW

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index bde9907..727c823 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig

@@ -11,6 +11,7 @@
 	select ARCH_HAS_ELF_RANDOMIZE
 	select ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_NO_SG_CHAIN
 	select ARCH_SUPPORTS_HUGETLBFS if PA20
 	select ARCH_SUPPORTS_MEMORY_FAILURE
@@ -34,7 +35,6 @@
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 	select GENERIC_SMP_IDLE_THREAD
 	select GENERIC_CPU_DEVICES
-	select GENERIC_STRNCPY_FROM_USER
 	select GENERIC_LIB_DEVMEM_IS_ALLOWED
 	select SYSCTL_ARCH_UNALIGN_ALLOW
 	select SYSCTL_EXCEPTION_TRACE

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index d01e340..d2df3d2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig

@@ -183,8 +183,6 @@
 	select GENERIC_IRQ_SHOW_LEVEL
 	select GENERIC_PCI_IOMAP		if PCI
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select GENERIC_VDSO_TIME_NS
 	select HAVE_ARCH_AUDITSYSCALL

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 47bbbca..49d642d 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig

@@ -56,8 +56,6 @@
 	select GENERIC_PTDUMP if MMU
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
 	select HANDLE_DOMAIN_IRQ
 	select HAVE_ARCH_AUDITSYSCALL

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a0e2130..f4f3908 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig

@@ -75,6 +75,8 @@
 	select ARCH_HAS_SET_MEMORY
 	select ARCH_HAS_STRICT_KERNEL_RWX
 	select ARCH_HAS_STRICT_MODULE_RWX
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_HAS_SYSCALL_WRAPPER
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
 	select ARCH_HAS_VDSO_DATA

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 45a0549..5d20509 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig

@@ -22,8 +22,6 @@
 	select GENERIC_IRQ_SHOW
 	select GENERIC_PCI_IOMAP if PCI
 	select GENERIC_SCHED_CLOCK
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_SMP_IDLE_THREAD
 	select GUP_GET_PTE_LOW_HIGH if X2TLB
 	select HAVE_ARCH_AUDITSYSCALL

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c5fa793..9f78822 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig

@@ -38,8 +38,6 @@
 	select HAVE_EBPF_JIT if SPARC64
 	select HAVE_DEBUG_BUGVERBOSE
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select MODULES_USE_ELF_RELA
 	select PCI_SYSCALL if PCI
 	select PCI_MSI_ARCH_FALLBACKS if PCI_MSI

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 0561b73c..77e66d3 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig

@@ -7,6 +7,8 @@
 	default y
 	select ARCH_EPHEMERAL_INODES
 	select ARCH_HAS_KCOV
+	select ARCH_HAS_STRNCPY_FROM_USER
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_NO_PREEMPT
 	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_ARCH_SECCOMP_FILTER

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4927065..5509c82 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig

@@ -144,8 +144,6 @@
 	select GENERIC_PENDING_IRQ		if SMP
 	select GENERIC_PTDUMP
 	select GENERIC_SMP_IDLE_THREAD
-	select GENERIC_STRNCPY_FROM_USER
-	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select GENERIC_GETTIMEOFDAY
 	select GENERIC_VDSO_TIME_NS

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2332b21..282fc195 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig

@@ -7,6 +7,8 @@
 	select ARCH_HAS_SYNC_DMA_FOR_CPU if MMU
 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if MMU
 	select ARCH_HAS_DMA_SET_UNCACHED if MMU
+	select ARCH_HAS_STRNCPY_FROM_USER if !KASAN
+	select ARCH_HAS_STRNLEN_USER
 	select ARCH_USE_MEMTEST
 	select ARCH_USE_QUEUED_RWLOCKS
 	select ARCH_USE_QUEUED_SPINLOCKS
@@ -20,7 +22,6 @@
 	select GENERIC_IRQ_SHOW
 	select GENERIC_PCI_IOMAP
 	select GENERIC_SCHED_CLOCK
-	select GENERIC_STRNCPY_FROM_USER if KASAN
 	select HAVE_ARCH_AUDITSYSCALL
 	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
 	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL

diff --git a/arch/xtensa/include/asm/uaccess.h b/arch/xtensa/include/asm/uaccess.h
index 5c9fb80..250ee68 100644
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h

@@ -290,8 +290,7 @@ clear_user(void __user *addr, unsigned long size)
 #define __clear_user  __xtensa_clear_user
 
 
-#ifndef CONFIG_GENERIC_STRNCPY_FROM_USER
-
+#ifdef CONFIG_HAS_STRNCPY_FROM_USER
 extern long __strncpy_user(char *dst, const char __user *src, long count);
 
 static inline long

diff --git a/lib/Kconfig b/lib/Kconfig
index d241fe4..0e66c9f 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig

@@ -50,12 +50,18 @@
 	  This option enables the use of hardware bit-reversal instructions on
 	  architectures which support such operations.
 
-config GENERIC_STRNCPY_FROM_USER
+config ARCH_HAS_STRNCPY_FROM_USER
 	bool
 
-config GENERIC_STRNLEN_USER
+config ARCH_HAS_STRNLEN_USER
 	bool
 
+config GENERIC_STRNCPY_FROM_USER
+	def_bool !ARCH_HAS_STRNCPY_FROM_USER
+
+config GENERIC_STRNLEN_USER
+	def_bool !ARCH_HAS_STRNLEN_USER
+
 config GENERIC_NET_UTILS
 	bool