Commit 04aaca19 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

char: raw: do not leak CONFIG_MAX_RAW_DEVS to userspace 



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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20200617083313.183184-1-masahiroy@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51d501e5

drivers/char/raw.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static struct raw_device_data *raw_devices; 
static DEFINE_MUTEX(raw_mutex);

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_PARM_DESC(max_raw_minors, "Maximum number of raw devices (1-65536)");
@@ -317,9 +317,9 @@ static int __init raw_init(void) 
	int ret;



	if (max_raw_minors < 1 || max_raw_minors > 65536) {

		printk(KERN_WARNING "raw: invalid max_raw_minors (must be"

			" between 1 and 65536), using %d\n", MAX_RAW_MINORS);

		max_raw_minors = MAX_RAW_MINORS;

		pr_warn("raw: invalid max_raw_minors (must be between 1 and 65536), using %d\n",

			CONFIG_MAX_RAW_DEVS);

		max_raw_minors = CONFIG_MAX_RAW_DEVS;

	}



	raw_devices = vzalloc(array_size(max_raw_minors,

include/uapi/linux/raw.h

+0 −2
Original line number Diff line number Diff line
@@ -14,6 +14,4 @@ struct raw_config_request 
	__u64	block_minor;

};



#define MAX_RAW_MINORS CONFIG_MAX_RAW_DEVS



#endif /* __LINUX_RAW_H */

scripts/headers_install.sh

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ include/uapi/linux/elfcore.h:CONFIG_BINFMT_ELF_FDPIC 
include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP

include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS

include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE

include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS

"



for c in $configs