From 942f5de49374d5470074d8e6c2dd86e02a7a12f1 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 12 Jun 2004 16:41:17 -0700 Subject: [PATCH] [PATCH] fix modprobe_path and hotplug_path sizes and sysctl From: Andy Whitcroft Both modprobe_path and hotplug_path are arbitrarily sized at 256 bytes and that size is also expressed directly in the sysctl code. It seems reasonable to define a standard length and use that for consitancy. This patch introduces the constant KMOD_PATH_LEN and uses that. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/linux/kmod.h | 2 ++ kernel/kmod.c | 4 ++-- kernel/sysctl.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 7c5af18df9d11..a484f52445cb8 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -23,6 +23,8 @@ #include #include +#define KMOD_PATH_LEN 256 + #ifdef CONFIG_KMOD /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ diff --git a/kernel/kmod.c b/kernel/kmod.c index 160aa3d958ad2..ea62192b7597a 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -47,7 +47,7 @@ static struct workqueue_struct *khelper_wq; /* modprobe_path is set via /proc/sys. */ -char modprobe_path[256] = "/sbin/modprobe"; +char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe"; /** * request_module - try to load a kernel module @@ -132,7 +132,7 @@ EXPORT_SYMBOL(request_module); events. the command is expected to load drivers when necessary, and may perform additional system setup. */ -char hotplug_path[256] = "/sbin/hotplug"; +char hotplug_path[KMOD_PATH_LEN] = "/sbin/hotplug"; EXPORT_SYMBOL(hotplug_path); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 2b3fe7fed2717..ae990887f338f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -392,7 +392,7 @@ static ctl_table kern_table[] = { .ctl_name = KERN_MODPROBE, .procname = "modprobe", .data = &modprobe_path, - .maxlen = 256, + .maxlen = KMOD_PATH_LEN, .mode = 0644, .proc_handler = &proc_dostring, .strategy = &sysctl_string, @@ -403,7 +403,7 @@ static ctl_table kern_table[] = { .ctl_name = KERN_HOTPLUG, .procname = "hotplug", .data = &hotplug_path, - .maxlen = 256, + .maxlen = KMOD_PATH_LEN, .mode = 0644, .proc_handler = &proc_dostring, .strategy = &sysctl_string, -- 2.53.0