GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-30 19:06:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

char: raw: do not leak CONFIG_MAX_RAW_DEVS to userspace

Browse source 
include/uapi/linux/raw.h leaks CONFIG_MAX_RAW_DEVS to userspace.

Userspace programs cannot use MAX_RAW_MINORS since CONFIG_MAX_RAW_DEVS
is not available anyway.

Remove the MAX_RAW_MINORS definition from the exported header, and use
CONFIG_MAX_RAW_DEVS in drivers/char/raw.c

While I was here, I converted printk(KERN_WARNING ...) to pr_warn(...)
and stretched the warning message.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20200617083313.183184-1-masahiroy@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Masahiro Yamada 2020-06-17 17:33:13 +09:00 • committed by Greg Kroah-Hartman
parent 51d501e540
commit 04aaca197f
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/char/raw.c
View file

@ -37,7 +37,7 @@ static struct raw_device_data *raw_devices;
static DEFINE_MUTEX(raw_mutex); static DEFINE_MUTEX(raw_mutex);
static const struct file_operations raw_ctl_fops; /* forward declaration */ static const struct file_operations raw_ctl_fops; /* forward declaration */
static int max_raw_minors = MAX_RAW_MINORS; static int max_raw_minors = CONFIG_MAX_RAW_DEVS;
module_param(max_raw_minors, int, 0); module_param(max_raw_minors, int, 0);
MODULE_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)"); MODULE_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)");
@ -317,9 +317,9 @@ static int __init raw_init(void)
int ret; int ret;
if (max_raw_minors < 1 || max_raw_minors > 65536) { if (max_raw_minors < 1 || max_raw_minors > 65536) {
printk(KERN_WARNING "raw: invalid max_raw_minors (must be" pr_warn("raw: invalid max_raw_minors (must be between 1 and 65536), using %d\n",
" between 1 and 65536), using %d\n", MAX_RAW_MINORS); CONFIG_MAX_RAW_DEVS);
max_raw_minors = MAX_RAW_MINORS; max_raw_minors = CONFIG_MAX_RAW_DEVS;
} }
raw_devices = vzalloc(array_size(max_raw_minors, raw_devices = vzalloc(array_size(max_raw_minors,

2
include/uapi/linux/raw.h
View file

@ -14,6 +14,4 @@ struct raw_config_request
__u64 block_minor; __u64 block_minor;
}; };
#define MAX_RAW_MINORS CONFIG_MAX_RAW_DEVS
#endif /* __LINUX_RAW_H */ #endif /* __LINUX_RAW_H */

1
scripts/headers_install.sh
View file

@ -90,7 +90,6 @@ include/uapi/linux/elfcore.h:CONFIG_BINFMT_ELF_FDPIC
include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP
include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE
include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS
" "
for c in $configs for c in $configs