mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
e6584c3964
Using sizeof(dst) for the "size" argument in strscpy() is the
overwhelmingly common case. Instead of requiring this everywhere, allow a
2-argument version to be used that will use the sizeof() internally. There
are other functions in the kernel with optional arguments[1], so this
isn't unprecedented, and improves readability. Update and relocate the
kern-doc for strscpy() too, and drop __HAVE_ARCH_STRSCPY as it is unused.
Adjust ARCH=um build to notice the changed export name, as it doesn't
do full header includes for the string helpers.
This could additionally let us save a few hundred lines of code:
1177 files changed, 2455 insertions(+), 3026 deletions(-)
with a treewide cleanup using Coccinelle:
@needless_arg@
expression DST, SRC;
@@
strscpy(DST, SRC
-, sizeof(DST)
)
Link: https://elixir.bootlin.com/linux/v6.7/source/include/linux/pci.h#L1517 [1]
Reviewed-by: Justin Stitt <justinstitt@google.com>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
60 lines
1.6 KiB
C
60 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
*/
|
|
|
|
#ifndef __USER_H__
|
|
#define __USER_H__
|
|
|
|
#include <generated/asm-offsets.h>
|
|
|
|
/*
|
|
* The usual definition - copied here because the kernel provides its own,
|
|
* fancier, type-safe, definition. Using that one would require
|
|
* copying too much infrastructure for my taste, so userspace files
|
|
* get less checking than kernel files.
|
|
*/
|
|
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
|
|
|
|
/* This is to get size_t and NULL */
|
|
#ifndef __UM_HOST__
|
|
#include <linux/types.h>
|
|
#else
|
|
#include <stddef.h>
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
extern void panic(const char *fmt, ...)
|
|
__attribute__ ((format (printf, 1, 2)));
|
|
|
|
/* Requires preincluding include/linux/kern_levels.h */
|
|
#define UM_KERN_EMERG KERN_EMERG
|
|
#define UM_KERN_ALERT KERN_ALERT
|
|
#define UM_KERN_CRIT KERN_CRIT
|
|
#define UM_KERN_ERR KERN_ERR
|
|
#define UM_KERN_WARNING KERN_WARNING
|
|
#define UM_KERN_NOTICE KERN_NOTICE
|
|
#define UM_KERN_INFO KERN_INFO
|
|
#define UM_KERN_DEBUG KERN_DEBUG
|
|
#define UM_KERN_CONT KERN_CONT
|
|
|
|
#ifdef UML_CONFIG_PRINTK
|
|
#define printk(...) _printk(__VA_ARGS__)
|
|
extern int _printk(const char *fmt, ...)
|
|
__attribute__ ((format (printf, 1, 2)));
|
|
#else
|
|
static inline int printk(const char *fmt, ...)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
extern int in_aton(char *str);
|
|
extern size_t strlcat(char *, const char *, size_t);
|
|
extern size_t sized_strscpy(char *, const char *, size_t);
|
|
#define strscpy(dst, src, size) sized_strscpy(dst, src, size)
|
|
|
|
/* Copied from linux/compiler-gcc.h since we can't include it directly */
|
|
#define barrier() __asm__ __volatile__("": : :"memory")
|
|
|
|
#endif
|