lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230216114234.36343-1-andriy.shevchenko@linux.intel.com> Date: Thu, 16 Feb 2023 13:42:33 +0200 From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com> To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Kees Cook <keescook@...omium.org>, linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org, sparclinux@...r.kernel.org, netdev@...r.kernel.org Cc: Heiko Carstens <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Alexander Gordeev <agordeev@...ux.ibm.com>, Christian Borntraeger <borntraeger@...ux.ibm.com>, Sven Schnelle <svens@...ux.ibm.com>, "David S. Miller" <davem@...emloft.net>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>, Dave Hansen <dave.hansen@...ux.intel.com>, x86@...nel.org, "H. Peter Anvin" <hpa@...or.com>, Andy Shevchenko <andy@...nel.org>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com> Subject: [PATCH net-next v1 1/2] string: Make memscan() to take const Make memscan() to take const so it will be easier replace some memchr() cases with it. Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com> --- arch/s390/include/asm/string.h | 4 ++-- arch/s390/lib/string.c | 2 +- arch/sparc/include/asm/asm-prototypes.h | 4 ++-- arch/sparc/include/asm/string.h | 7 ++++--- arch/x86/include/asm/string_32.h | 2 +- arch/x86/lib/string_32.c | 2 +- include/linux/string.h | 2 +- lib/string.c | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h index 3fae93ddb322..0196fd466a39 100644 --- a/arch/s390/include/asm/string.h +++ b/arch/s390/include/asm/string.h @@ -120,7 +120,7 @@ static inline void *memchr(const void * s, int c, size_t n) #endif #ifdef __HAVE_ARCH_MEMSCAN -static inline void *memscan(void *s, int c, size_t n) +static inline void *memscan(const void *s, int c, size_t n) { const void *ret = s + n; @@ -205,7 +205,7 @@ static inline size_t strnlen(const char * s, size_t n) #endif #else /* IN_ARCH_STRING_C */ void *memchr(const void * s, int c, size_t n); -void *memscan(void *s, int c, size_t n); +void *memscan(const void *s, int c, size_t n); char *strcat(char *dst, const char *src); char *strcpy(char *dst, const char *src); size_t strlen(const char *s); diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c index 7d8741818239..ec9786fde1dd 100644 --- a/arch/s390/lib/string.c +++ b/arch/s390/lib/string.c @@ -331,7 +331,7 @@ EXPORT_SYMBOL(memcmp); * the area if @c is not found */ #ifdef __HAVE_ARCH_MEMSCAN -void *memscan(void *s, int c, size_t n) +void *memscan(const void *s, int c, size_t n) { const void *ret = s + n; diff --git a/arch/sparc/include/asm/asm-prototypes.h b/arch/sparc/include/asm/asm-prototypes.h index 4987c735ff56..3a82a86a27a6 100644 --- a/arch/sparc/include/asm/asm-prototypes.h +++ b/arch/sparc/include/asm/asm-prototypes.h @@ -13,8 +13,8 @@ #include <asm/oplib.h> #include <linux/atomic.h> -void *__memscan_zero(void *, size_t); -void *__memscan_generic(void *, int, size_t); +void *__memscan_zero(const void *, size_t); +void *__memscan_generic(const void *, int, size_t); void *__bzero(void *, size_t); void VISenter(void); /* Dummy prototype to supress warning */ #undef memcpy diff --git a/arch/sparc/include/asm/string.h b/arch/sparc/include/asm/string.h index 001a17baf2d5..7761a037b377 100644 --- a/arch/sparc/include/asm/string.h +++ b/arch/sparc/include/asm/string.h @@ -21,10 +21,11 @@ void *memmove(void *, const void *, __kernel_size_t); #define memscan(__arg0, __char, __arg2) \ ({ \ - void *__memscan_zero(void *, size_t); \ - void *__memscan_generic(void *, int, size_t); \ - void *__retval, *__addr = (__arg0); \ + void *__memscan_zero(const void *, size_t); \ + void *__memscan_generic(const void *, int, size_t); \ + const void *__addr = (__arg0); \ size_t __size = (__arg2); \ + void *__retval; \ \ if(__builtin_constant_p(__char) && !(__char)) \ __retval = __memscan_zero(__addr, __size); \ diff --git a/arch/x86/include/asm/string_32.h b/arch/x86/include/asm/string_32.h index 32c0d981a82a..30245f7707e7 100644 --- a/arch/x86/include/asm/string_32.h +++ b/arch/x86/include/asm/string_32.h @@ -223,7 +223,7 @@ static inline void *memset32(uint32_t *s, uint32_t v, size_t n) * find the first occurrence of byte 'c', or 1 past the area if none */ #define __HAVE_ARCH_MEMSCAN -extern void *memscan(void *addr, int c, size_t size); +extern void *memscan(const void *addr, int c, size_t size); #endif /* __KERNEL__ */ diff --git a/arch/x86/lib/string_32.c b/arch/x86/lib/string_32.c index 53b3f202267c..4124d6678f72 100644 --- a/arch/x86/lib/string_32.c +++ b/arch/x86/lib/string_32.c @@ -198,7 +198,7 @@ EXPORT_SYMBOL(memchr); #endif #ifdef __HAVE_ARCH_MEMSCAN -void *memscan(void *addr, int c, size_t size) +void *memscan(const void *addr, int c, size_t size) { if (!size) return addr; diff --git a/include/linux/string.h b/include/linux/string.h index c062c581a98b..a7bff7ed3cb0 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -150,7 +150,7 @@ extern void * memcpy(void *,const void *,__kernel_size_t); extern void * memmove(void *,const void *,__kernel_size_t); #endif #ifndef __HAVE_ARCH_MEMSCAN -extern void * memscan(void *,int,__kernel_size_t); +extern void * memscan(const void *,int,__kernel_size_t); #endif #ifndef __HAVE_ARCH_MEMCMP extern int memcmp(const void *,const void *,__kernel_size_t); diff --git a/lib/string.c b/lib/string.c index 3d55ef890106..30a63048d4cc 100644 --- a/lib/string.c +++ b/lib/string.c @@ -725,7 +725,7 @@ EXPORT_SYMBOL(bcmp); * returns the address of the first occurrence of @c, or 1 byte past * the area if @c is not found */ -void *memscan(void *addr, int c, size_t size) +void *memscan(const void *addr, int c, size_t size) { unsigned char *p = addr; -- 2.39.1
Powered by blists - more mailing lists