tree 68943f50cb9169af63ccdd819b75e9a6320efd0a
parent b4f662aceb7d82655aa4bfefc390146662991be9
author Bert Wesarg <[EMAIL PROTECTED]> Tue Apr 12 08:26:10 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:10 2005

[PATCH] kernel/param.c: don't use .max when .num is NULL in param_array_set()

there seems to be a bug, at least for me, in kernel/param.c for arrays with
.num == NULL.  If .num == NULL, the function param_array_set() uses &.max
for the call to param_array(), wich alters the .max value to the number of
arguments.  The result is, you can't set more array arguments as the last
time you set the parameter.

example:

# a module 'example' with
# static int array[10] = { 0, };
# module_param_array(array, int, NULL, 0644);

$ insmod example.ko array=1,2,3
$ cat /sys/module/example/parameters/array
1,2,3
$ echo "4,3,2,1" > /sys/module/example/parameters/array
$ dmesg | tail -n 1
kernel: array: can take only 3 arguments

Signed-off-by: Bert Wesarg <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 params.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: kernel/params.c
===================================================================
--- fdf3a3d0f4168f4901f088832ea04d3dbc9c8c4e/kernel/params.c  (mode:100644 
sha1:68e876cf432c12060bfd76dc03ea04e19d1e481e)
+++ 68943f50cb9169af63ccdd819b75e9a6320efd0a/kernel/params.c  (mode:100644 
sha1:1b079e576165994b792ba852997630533d943f77)
@@ -314,9 +314,10 @@
 int param_array_set(const char *val, struct kernel_param *kp)
 {
        struct kparam_array *arr = kp->arg;
+       unsigned int temp_num;
 
        return param_array(kp->name, val, 1, arr->max, arr->elem,
-                          arr->elemsize, arr->set, arr->num ?: &arr->max);
+                          arr->elemsize, arr->set, arr->num ?: &temp_num);
 }
 
 int param_array_get(char *buffer, struct kernel_param *kp)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to