The following commit has been merged in the linux branch: commit d553ad864e3b3dde3f1038d491e207021b2d6293 Author: Rusty Russell rusty@rustcorp.com.au Date: Thu Oct 29 08:56:17 2009 -0600

param: fix NULL comparison on oom

kp->arg is always true: it's the contents of that pointer we care about.

Reported-by: Takashi Iwai tiwai@suse.de Signed-off-by: Rusty Russell rusty@rustcorp.com.au Cc: stable@kernel.org

diff --git a/kernel/params.c b/kernel/params.c index 95ef27c..00520c4 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -222,7 +222,7 @@ int param_set_charp(const char *val, struct kernel_param *kp) * don't need to; this mangled commandline is preserved. */ if (slab_is_available()) { *(char **)kp->arg = kstrdup(val, GFP_KERNEL); - if (!kp->arg) + if (!*(char **)kp->arg) return -ENOMEM; } else *(const char **)kp->arg = val;