From: Kees Cook <kees@kernel.org>
Date: Mon, 23 Mar 2026 01:16:06 +0000 (+0000)
Subject: m68k: Remove arch-specific strncpy() implementation
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ad3242a9acaa01cc9ecc6e483341697ca4f77461;p=thirdparty%2Fkernel%2Flinux.git

m68k: Remove arch-specific strncpy() implementation

strncpy() has no remaining callers in the kernel[1]. Remove the
m68k-specific inline assembly implementation and __HAVE_ARCH_STRNCPY
define, falling back to the generic version in lib/string.c.

Link: https://github.com/KSPP/linux/issues/90 [1]
Signed-off-by: Kees Cook <kees@kernel.org>
---

diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
index 760cc13acdf41..ae6a6b51ad071 100644
--- a/arch/m68k/include/asm/string.h
+++ b/arch/m68k/include/asm/string.h
@@ -21,23 +21,6 @@ static inline size_t strnlen(const char *s, size_t count)
 	return sc - s;
 }
 
-#define __HAVE_ARCH_STRNCPY
-static inline char *strncpy(char *dest, const char *src, size_t n)
-{
-	char *xdest = dest;
-
-	asm volatile ("\n"
-		"	jra	2f\n"
-		"1:	move.b	(%1),(%0)+\n"
-		"	jeq	2f\n"
-		"	addq.l	#1,%1\n"
-		"2:	subq.l	#1,%2\n"
-		"	jcc	1b\n"
-		: "+a" (dest), "+a" (src), "+d" (n)
-		: : "memory");
-	return xdest;
-}
-
 #define __HAVE_ARCH_MEMMOVE
 extern void *memmove(void *, const void *, __kernel_size_t);