mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
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>
This commit is contained in:
parent
4cb5e246e6
commit
ad3242a9ac
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user