aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2011-08-02 12:32:00 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:43 -0700
commiteb81cf19f5740d1397a72d1abb59570e1dda2711 (patch)
tree10289bf0289a7c5fb89b6086fb861a5ad0d666c7
parentb41ed9c38a42daa4b474ebf18eb06ef1f17351f5 (diff)
downloadlinux-linaro-eb81cf19f5740d1397a72d1abb59570e1dda2711.tar.gz
dm mpath: fix potential NULL pointer in feature arg processing
commit 286f367dad40beb3234a18c17391d03ba939a7f3 upstream. Avoid dereferencing a NULL pointer if the number of feature arguments supplied is fewer than indicated. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/md/dm-mpath.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index aa4e570c2cb..209991bebd3 100644
--- a/drivers/md/dm-mpath.c
+++ b/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--;