From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Brown Subject: Re: [PATCH] fix: incremental on invalid container causes segfault Date: Tue, 7 Dec 2010 21:02:35 +1100 Message-ID: <20101207210235.7bc6541a@notabene.brown> References: <66C59AD0932712458090B447266D638C010A080454@irsmsx504.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <66C59AD0932712458090B447266D638C010A080454@irsmsx504.ger.corp.intel.com> Sender: linux-raid-owner@vger.kernel.org To: "Hawrylewicz Czarnowski, Przemyslaw" Cc: "linux-raid@vger.kernel.org" , "Williams, Dan J" , "Ciechanowski, Ed" , "Labun, Marcin" , "Czarnowska, Anna" List-Id: linux-raid.ids On Mon, 6 Dec 2010 06:40:40 +0000 "Hawrylewicz Czarnowski, Przemyslaw" wrote: > counterpart of 417f346ee0 for incremental. > If md device has metadata_version="none" super_by_fd() matches supertype=super0. > Call of load_container() dereferences null, so we have to forbid it. > > Signed-off-by: Przemyslaw Czarnowski > --- > Incremental.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/Incremental.c b/Incremental.c > index 8cae1ee..9399f5b 100644 > --- a/Incremental.c > +++ b/Incremental.c > @@ -134,7 +134,7 @@ int Incremental(char *devname, int verbose, int runstop, > if (must_be_container(dfd)) { > if (!st) > st = super_by_fd(dfd, NULL); > - if (st) > + if (st && st->ss->load_container) > rv = st->ss->load_container(st, dfd, NULL); > > close(dfd); Thanks. Applied. NeilBrown