[PATCH 3/4] mtd: fixup corner case error handling in mtd_device_parse_register()

[Brian Norris]

On Tue, Jun 02, 2015 at 10:03:05AM +0200, Richard Weinberger wrote:
> Am 02.06.2015 um 01:17 schrieb Brian Norris:
> > Since commit 3efe41be224c ("mtd: implement common reboot notifier
> > boilerplate"), we might try to register a reboot notifier for an MTD
> > that failed to register. Let's avoid this by making the error path
> > clearer.
> > 
> > Signed-off-by: Brian Norris <computersforpeace at gmail.com>
> > ---
> >  drivers/mtd/mtdcore.c | 11 +++++++++--
> >  1 file changed, 9 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> > index 8bbbb751bf45..03eec42dc715 100644
> > --- a/drivers/mtd/mtdcore.c
> > +++ b/drivers/mtd/mtdcore.c
> > @@ -579,9 +579,15 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,
> >  		else
> >  			ret = nr_parts;
> >  	}
> > +	/* Didn't come up with either parsed OR fallback partitions */
> > +	if (ret < 0) {
> > +		pr_info("mtd: failed to find partitions\n");
> > +		goto out;
> > +	}
> >  
> > -	if (ret >= 0)
> > -		ret = mtd_add_device_partitions(mtd, real_parts, ret);
> > +	ret = mtd_add_device_partitions(mtd, real_parts, ret);
> > +	if (ret)
> > +		goto out;
> >  
> >  	/*
> >  	 * FIXME: some drivers unfortunately call this function more than once.
> > @@ -596,6 +602,7 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,
> >  		register_reboot_notifier(&mtd->reboot_notifier);
> >  	}
> >  
> > +out:
> >  	kfree(real_parts);
> >  	return ret;
> >  }
> 
> Reviewed-by: Richard Weinberger <richard at nod.at>

Not sure why I left this one; applied to l2-mtd.git