From e3af3c616c8f674fc2b944cedaa6efe558ba5ca6 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Tue, 2 Aug 2011 12:32:00 +0100
Subject: [PATCH] --- yaml --- r: 262182 b: refs/heads/master c:
 286f367dad40beb3234a18c17391d03ba939a7f3 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 b9a25261ae76..dc62a24c1bde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 762a80d9fc9f690a3a35983f3b4619a220650808
+refs/heads/master: 286f367dad40beb3234a18c17391d03ba939a7f3
diff --git a/trunk/drivers/md/dm-mpath.c b/trunk/drivers/md/dm-mpath.c
index c3547016f0f1..adf851a081bd 100644
--- a/trunk/drivers/md/dm-mpath.c
+++ b/trunk/drivers/md/dm-mpath.c
@@ -807,6 +807,11 @@ static int parse_features(struct arg_set *as, struct multipath *m)
 	if (!argc)
 		return 0;
 
+	if (argc > as->argc) {
+		ti->error = "not enough arguments for features";
+		return -EINVAL;
+	}
+
 	do {
 		param_name = shift(as);
 		argc--;