From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761286AbdEXKxe (ORCPT ); Wed, 24 May 2017 06:53:34 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:36430 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752949AbdEXKwU (ORCPT ); Wed, 24 May 2017 06:52:20 -0400 Date: Wed, 24 May 2017 11:52:16 +0100 From: Lee Jones To: "Gustavo A. R. Silva" Cc: Charles Keepax , patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] mfd: wm831x: add null check before pointer dereference Message-ID: <20170524105216.5j2byctru7wbs5zd@dell> References: <20170524035039.Horde.8P6qvsRAtBDgvQ2a_2CB5w-@gator4166.hostgator.com> <20170524091852.GA7702@embeddedgus> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170524091852.GA7702@embeddedgus> 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, 24 May 2017, Gustavo A. R. Silva wrote: > Add NULL check before dereferencing pointer of_id in order to avoid > a potential NULL pointer dereference. > > Addresses-Coverity-ID: 1408830 > Cc: Lee Jones > Cc: Charles Keepax > Signed-off-by: Gustavo A. R. Silva > --- > Changes in v2: > Update error log and return value. > > drivers/mfd/wm831x-spi.c | 4 ++++ > 1 file changed, 4 insertions(+) Applied, thanks. > diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c > index c332e28..018ce65 100644 > --- a/drivers/mfd/wm831x-spi.c > +++ b/drivers/mfd/wm831x-spi.c > @@ -34,6 +34,10 @@ static int wm831x_spi_probe(struct spi_device *spi) > > if (spi->dev.of_node) { > of_id = of_match_device(wm831x_of_match, &spi->dev); > + if (!of_id) { > + dev_err(&spi->dev, "Failed to match device\n"); > + return -ENODEV; > + } > type = (enum wm831x_parent)of_id->data; > } else { > type = (enum wm831x_parent)id->driver_data; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog