mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
f9e7ff9c6f
Current SH will get below warning at strncpy()
In file included from ${LINUX}/arch/sh/include/asm/string.h:3,
from ${LINUX}/include/linux/string.h:20,
from ${LINUX}/include/linux/bitmap.h:9,
from ${LINUX}/include/linux/nodemask.h:95,
from ${LINUX}/include/linux/mmzone.h:17,
from ${LINUX}/include/linux/gfp.h:6,
from ${LINUX}/innclude/linux/slab.h:15,
from ${LINUX}/linux/drivers/mmc/host/vub300.c:38:
${LINUX}/drivers/mmc/host/vub300.c: In function 'new_system_port_status':
${LINUX}/arch/sh/include/asm/string_32.h:51:42: warning: array subscript\
80 is above array bounds of 'char[26]' [-Warray-bounds]
: "0" (__dest), "1" (__src), "r" (__src+__n)
~~~~~^~~~
In general, strncpy() should behave like below.
char dest[10];
char *src = "12345";
strncpy(dest, src, 10);
// dest = {'1', '2', '3', '4', '5',
'\0','\0','\0','\0','\0'}
But, current SH strnpy() has 2 issues.
1st is it will access to out-of-memory (= src + 10).
2nd is it needs big fixup for it, and maintenance __asm__
code is difficult.
To solve these issues, this patch simply uses generic strncpy()
instead of architecture specific one.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Modra <amodra@gmail.com>
Cc: Bin Meng <bin.meng@windriver.com>
Cc: Chen Zhou <chenzhou10@huawei.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://marc.info/?l=linux-renesas-soc&m=157664657013309
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
106 lines
2.2 KiB
C
106 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_SH_STRING_H
|
|
#define __ASM_SH_STRING_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* Copyright (C) 1999 Niibe Yutaka
|
|
* But consider these trivial functions to be public domain.
|
|
*/
|
|
|
|
#define __HAVE_ARCH_STRCPY
|
|
static inline char *strcpy(char *__dest, const char *__src)
|
|
{
|
|
register char *__xdest = __dest;
|
|
unsigned long __dummy;
|
|
|
|
__asm__ __volatile__("1:\n\t"
|
|
"mov.b @%1+, %2\n\t"
|
|
"mov.b %2, @%0\n\t"
|
|
"cmp/eq #0, %2\n\t"
|
|
"bf/s 1b\n\t"
|
|
" add #1, %0\n\t"
|
|
: "=r" (__dest), "=r" (__src), "=&z" (__dummy)
|
|
: "0" (__dest), "1" (__src)
|
|
: "memory", "t");
|
|
|
|
return __xdest;
|
|
}
|
|
|
|
#define __HAVE_ARCH_STRCMP
|
|
static inline int strcmp(const char *__cs, const char *__ct)
|
|
{
|
|
register int __res;
|
|
unsigned long __dummy;
|
|
|
|
__asm__ __volatile__(
|
|
"mov.b @%1+, %3\n"
|
|
"1:\n\t"
|
|
"mov.b @%0+, %2\n\t"
|
|
"cmp/eq #0, %3\n\t"
|
|
"bt 2f\n\t"
|
|
"cmp/eq %2, %3\n\t"
|
|
"bt/s 1b\n\t"
|
|
" mov.b @%1+, %3\n\t"
|
|
"add #-2, %1\n\t"
|
|
"mov.b @%1, %3\n\t"
|
|
"sub %3, %2\n"
|
|
"2:"
|
|
: "=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
|
|
: "0" (__cs), "1" (__ct)
|
|
: "t");
|
|
|
|
return __res;
|
|
}
|
|
|
|
#define __HAVE_ARCH_STRNCMP
|
|
static inline int strncmp(const char *__cs, const char *__ct, size_t __n)
|
|
{
|
|
register int __res;
|
|
unsigned long __dummy;
|
|
|
|
if (__n == 0)
|
|
return 0;
|
|
|
|
__asm__ __volatile__(
|
|
"mov.b @%1+, %3\n"
|
|
"1:\n\t"
|
|
"mov.b @%0+, %2\n\t"
|
|
"cmp/eq %6, %0\n\t"
|
|
"bt/s 2f\n\t"
|
|
" cmp/eq #0, %3\n\t"
|
|
"bt/s 3f\n\t"
|
|
" cmp/eq %3, %2\n\t"
|
|
"bt/s 1b\n\t"
|
|
" mov.b @%1+, %3\n\t"
|
|
"add #-2, %1\n\t"
|
|
"mov.b @%1, %3\n"
|
|
"2:\n\t"
|
|
"sub %3, %2\n"
|
|
"3:"
|
|
:"=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy)
|
|
: "0" (__cs), "1" (__ct), "r" (__cs+__n)
|
|
: "t");
|
|
|
|
return __res;
|
|
}
|
|
|
|
#define __HAVE_ARCH_MEMSET
|
|
extern void *memset(void *__s, int __c, size_t __count);
|
|
|
|
#define __HAVE_ARCH_MEMCPY
|
|
extern void *memcpy(void *__to, __const__ void *__from, size_t __n);
|
|
|
|
#define __HAVE_ARCH_MEMMOVE
|
|
extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
|
|
|
|
#define __HAVE_ARCH_MEMCHR
|
|
extern void *memchr(const void *__s, int __c, size_t __n);
|
|
|
|
#define __HAVE_ARCH_STRLEN
|
|
extern size_t strlen(const char *);
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* __ASM_SH_STRING_H */
|