Commit 4cdc4cc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic updates from Arnd Bergmann:
 "The main content for 5.15 is a series that cleans up the handling of
  strncpy_from_user() and strnlen_user(), removing a lot of slightly
  incorrect versions of these in favor of the lib/strn*.c helpers that
  implement these correctly and more efficiently.

  The only architectures that retain a private version now are mips,
  ia64, um and parisc. I had offered to convert those at all, but Thomas
  Bogendoerfer wanted to keep the mips version for the moment until he
  had a chance to do regression testing.

  The branch also contains two patches for bitops and for ffs()"

* tag 'asm-generic-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  bitops/non-atomic: make @nr unsigned to avoid any DIV
  asm-generic: ffs: Drop bogus reference to ffz location
  asm-generic: reverse GENERIC_{STRNCPY_FROM,STRNLEN}_USER symbols
  asm-generic: remove extra strn{cpy_from,len}_user declarations
  asm-generic: uaccess: remove inline strncpy_from_user/strnlen_user
  s390: use generic strncpy/strnlen from_user
  microblaze: use generic strncpy/strnlen from_user
  csky: use generic strncpy/strnlen from_user
  arc: use generic strncpy/strnlen from_user
  hexagon: use generic strncpy/strnlen from_user
  h8300: remove stale strncpy_from_user
  asm-generic/uaccess.h: remove __strncpy_from_user/__strnlen_user
parents 57c78a23 8f76f9c4

arch/alpha/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ config ALPHA 
	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

arch/arc/include/asm/uaccess.h

+0 −72
Original line number Diff line number Diff line
@@ -655,88 +655,16 @@ static inline unsigned long __arc_clear_user(void __user *to, unsigned long n) 
	return res;

}



static inline long

__arc_strncpy_from_user(char *dst, const char __user *src, long count)

{

	long res = 0;

	char val;



	if (count == 0)

		return 0;



	__asm__ __volatile__(

	"	mov	lp_count, %5		\n"

	"	lp	3f			\n"

	"1:	ldb.ab  %3, [%2, 1]		\n"

	"	breq.d	%3, 0, 3f               \n"

	"	stb.ab  %3, [%1, 1]		\n"

	"	add	%0, %0, 1	# Num of NON NULL bytes copied	\n"

	"3:								\n"

	"	.section .fixup, \"ax\"		\n"

	"	.align 4			\n"

	"4:	mov %0, %4		# sets @res as -EFAULT	\n"

	"	j   3b				\n"

	"	.previous			\n"

	"	.section __ex_table, \"a\"	\n"

	"	.align 4			\n"

	"	.word   1b, 4b			\n"

	"	.previous			\n"

	: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)

	: "g"(-EFAULT), "r"(count)

	: "lp_count", "memory");



	return res;

}



static inline long __arc_strnlen_user(const char __user *s, long n)

{

	long res, tmp1, cnt;

	char val;



	__asm__ __volatile__(

	"	mov %2, %1			\n"

	"1:	ldb.ab  %3, [%0, 1]		\n"

	"	breq.d  %3, 0, 2f		\n"

	"	sub.f   %2, %2, 1		\n"

	"	bnz 1b				\n"

	"	sub %2, %2, 1			\n"

	"2:	sub %0, %1, %2			\n"

	"3:	;nop				\n"

	"	.section .fixup, \"ax\"		\n"

	"	.align 4			\n"

	"4:	mov %0, 0			\n"

	"	j   3b				\n"

	"	.previous			\n"

	"	.section __ex_table, \"a\"	\n"

	"	.align 4			\n"

	"	.word 1b, 4b			\n"

	"	.previous			\n"

	: "=r"(res), "=r"(tmp1), "=r"(cnt), "=r"(val)

	: "0"(s), "1"(n)

	: "memory");



	return res;

}



#ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE



#define INLINE_COPY_TO_USER

#define INLINE_COPY_FROM_USER



#define __clear_user(d, n)		__arc_clear_user(d, n)

#define __strncpy_from_user(d, s, n)	__arc_strncpy_from_user(d, s, n)

#define __strnlen_user(s, n)		__arc_strnlen_user(s, n)

#else

extern unsigned long arc_clear_user_noinline(void __user *to,

		unsigned long n);

extern long arc_strncpy_from_user_noinline (char *dst, const char __user *src,

		long count);

extern long arc_strnlen_user_noinline(const char __user *src, long n);



#define __clear_user(d, n)		arc_clear_user_noinline(d, n)

#define __strncpy_from_user(d, s, n)	arc_strncpy_from_user_noinline(d, s, n)

#define __strnlen_user(s, n)		arc_strnlen_user_noinline(s, n)



#endif



#include <asm/segment.h>

arch/arc/mm/extable.c

+0 −12
Original line number Diff line number Diff line
@@ -32,16 +32,4 @@ unsigned long arc_clear_user_noinline(void __user *to, 
}

EXPORT_SYMBOL(arc_clear_user_noinline);



long arc_strncpy_from_user_noinline(char *dst, const char __user *src,

		long count)

{

	return __arc_strncpy_from_user(dst, src, count);

}

EXPORT_SYMBOL(arc_strncpy_from_user_noinline);



long arc_strnlen_user_noinline(const char __user *src, long n)

{

	return __arc_strnlen_user(src, n);

}

EXPORT_SYMBOL(arc_strnlen_user_noinline);

#endif

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ config ARM 
	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

arch/arm64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ config ARM64 
	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