From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751391AbdGQMV0 (ORCPT ); Mon, 17 Jul 2017 08:21:26 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:35567 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbdGQMVY (ORCPT ); Mon, 17 Jul 2017 08:21:24 -0400 Date: Mon, 17 Jul 2017 13:21:20 +0100 From: Lee Jones To: Christophe JAILLET Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] mfd: Fix potential NULL pointer dereference Message-ID: <20170717122120.uxevckop5mgzttid@dell> References: <20170705055054.8022-1-christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170705055054.8022-1-christophe.jaillet@wanadoo.fr> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 05 Jul 2017, Christophe JAILLET wrote: > if 'max8998_i2c_parse_dt_pdata() fails (when out of memory), a NULL > pointer dereference will occur in the error handling code. > > Return directly instead. > > Fixes: ee999fb3f17f("mfd: max8998: Add support for Device Tree") > Signed-off-by: Christophe JAILLET > --- > drivers/mfd/max8998.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c > index 4c33b8063bc3..b1d3f70782d9 100644 > --- a/drivers/mfd/max8998.c > +++ b/drivers/mfd/max8998.c > @@ -192,10 +192,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c, > > if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) { > pdata = max8998_i2c_parse_dt_pdata(&i2c->dev); > - if (IS_ERR(pdata)) { > - ret = PTR_ERR(pdata); > - goto err; > - } > + if (IS_ERR(pdata)) > + return PTR_ERR(pdata); > } > > i2c_set_clientdata(i2c, max8998); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog