From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 16 May 2013 15:43:55 +0000 (+0200)
Subject: usermodehelper: check subprocess_info->path != NULL
X-Git-Tag: v3.2.46~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5bcd909bef8caf59cfc85f02ac2879419c89ab3;p=people%2Fms%2Flinux.git

usermodehelper: check subprocess_info->path != NULL

commit 264b83c07a84223f0efd0d1db9ccc66d6f88288f upstream.

argv_split(empty_or_all_spaces) happily succeeds, it simply returns
argc == 0 and argv[0] == NULL. Change call_usermodehelper_exec() to
check sub_info->path != NULL to avoid the crash.

This is the minimal fix, todo:

 - perhaps we should change argv_split() to return NULL or change the
   callers.

 - kill or justify ->path[0] check

 - narrow the scope of helper_lock()

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-By: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/kernel/kmod.c b/kernel/kmod.c
index d6fe08a1707c..a16dac13576c 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -467,6 +467,11 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info,
 	int retval = 0;
 
 	helper_lock();
+	if (!sub_info->path) {
+		retval = -EINVAL;
+		goto out;
+	}
+
 	if (sub_info->path[0] == '\0')
 		goto out;