From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964808Ab1HFAMl (ORCPT ); Fri, 5 Aug 2011 20:12:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39785 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932476Ab1HFAMe (ORCPT ); Fri, 5 Aug 2011 20:12:34 -0400 X-Mailbox-Line: From gregkh@clark.kroah.org Fri Aug 5 17:04:16 2011 Message-Id: <20110806000416.417654651@clark.kroah.org> User-Agent: quilt/0.48-16.4 Date: Fri, 05 Aug 2011 17:04:06 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Mike Snitzer , Alasdair G Kergon Subject: [48/50] dm mpath: fix potential NULL pointer in feature arg processing In-Reply-To: <20110806000419.GA28392@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.33-longterm review patch. If anyone has any objections, please let us know. ------------------ From: Mike Snitzer commit 286f367dad40beb3234a18c17391d03ba939a7f3 upstream. Avoid dereferencing a NULL pointer if the number of feature arguments supplied is fewer than indicated. Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-mpath.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -782,6 +782,11 @@ static int parse_features(struct arg_set if (!argc) return 0; + if (argc > as->argc) { + ti->error = "not enough arguments for features"; + return -EINVAL; + } + do { param_name = shift(as); argc--;