From cd8c50f1df014dea5027957ccce29d492fee9c23 Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Mon, 22 Jun 2009 10:12:10 +0100
Subject: [PATCH] --- yaml --- r: 154232 b: refs/heads/master c:
 e094f4f15f5169526c7200b9bde44b900548a81e h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-mpath.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 378a6ad07ff8..d4b5d8f94d45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e0497c0c017664994819f4602dc07fd95896c52
+refs/heads/master: e094f4f15f5169526c7200b9bde44b900548a81e
diff --git a/trunk/drivers/md/dm-mpath.c b/trunk/drivers/md/dm-mpath.c
index d880299334e9..f25bdebcb4ab 100644
--- a/trunk/drivers/md/dm-mpath.c
+++ b/trunk/drivers/md/dm-mpath.c
@@ -705,6 +705,11 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m)
 	if (!hw_argc)
 		return 0;
 
+	if (hw_argc > as->argc) {
+		ti->error = "not enough arguments for hardware handler";
+		return -EINVAL;
+	}
+
 	m->hw_handler_name = kstrdup(shift(as), GFP_KERNEL);
 	request_module("scsi_dh_%s", m->hw_handler_name);
 	if (scsi_dh_handler_exist(m->hw_handler_name) == 0) {