Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43cdff92 authored by Sebastien Dugué's avatar Sebastien Dugué Committed by Linus Torvalds
Browse files

[PATCH] Fix IPMI watchdog set_param_str() using kstrdup 



set_param_str() cannot use kstrdup() to duplicate the parameter.  That's
fine when the driver is compiled as a module but it sure is not when built
into the kernel as the kernel parameters are parsed before the kmalloc
slabs are setup.

Signed-off-by: default avatarSebastien Dugué <sebastien.dugue@bull.net>
Acked-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7479b1ce

drivers/char/ipmi/ipmi_watchdog.c

+5 −6
Original line number Diff line number Diff line
@@ -216,13 +216,13 @@ static int set_param_str(const char *val, struct kernel_param *kp) 
{

	action_fn  fn = (action_fn) kp->arg;

	int        rv = 0;

	char       *dup, *s;

	char       valcp[16];

	char       *s;



	dup = kstrdup(val, GFP_KERNEL);

	if (!dup)

		return -ENOMEM;

	strncpy(valcp, val, 16);

	valcp[15] = '\0';



	s = strstrip(dup);

	s = strstrip(valcp);



	down_read(&register_sem);

	rv = fn(s, NULL);
@@ -235,7 +235,6 @@ static int set_param_str(const char *val, struct kernel_param *kp) 


 out_unlock:

	up_read(&register_sem);

	kfree(dup);

	return rv;

}