From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932868AbdA0Ma4 (ORCPT ); Fri, 27 Jan 2017 07:30:56 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35511 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932655AbdA0Maw (ORCPT ); Fri, 27 Jan 2017 07:30:52 -0500 Subject: Re: [PATCH] Mtd: nand - Fix possible NULL derefrence. To: Shailendra Verma , Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Cyrille Pitchen , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, p.shailesh@samsung.com, ashish.kalra@samsung.com, Shailendra Verma References: <1485516553-4438-1-git-send-email-shailendra.v@samsung.com> From: Marek Vasut Message-ID: <9a682616-d1c3-a096-0736-fa23aca10299@gmail.com> Date: Fri, 27 Jan 2017 13:24:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <1485516553-4438-1-git-send-email-shailendra.v@samsung.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/27/2017 12:29 PM, Shailendra Verma wrote: > of_match_device could return NULL, and so can cause a NULL > pointer dereference later. > > Signed-off-by: Shailendra Verma Nice find, but can you split this into two patches ? And the prefix is 'mtd' without capital letter. Thanks > --- > drivers/mtd/nand/mxc_nand.c | 4 ++++ > drivers/mtd/nand/vf610_nfc.c | 4 ++++ > 2 files changed, 8 insertions(+) > > diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c > index d7f724b..ca1b8ad 100644 > --- a/drivers/mtd/nand/mxc_nand.c > +++ b/drivers/mtd/nand/mxc_nand.c > @@ -1596,6 +1596,10 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host) > if (!np) > return 1; > > + if (!of_id) { > + dev_err(host->dev, "Error: No device match found\n"); > + return -ENODEV; > + } > host->devtype_data = of_id->data; > > return 0; > diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c > index 3ad514c..0e09c11 100644 > --- a/drivers/mtd/nand/vf610_nfc.c > +++ b/drivers/mtd/nand/vf610_nfc.c > @@ -674,6 +674,10 @@ static int vf610_nfc_probe(struct platform_device *pdev) > } > > of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev); > + if (!of_id) { > + dev_err(&pdev->dev, "Error: No device match found\n"); > + return -ENODEV; > + } > nfc->variant = (enum vf610_nfc_variant)of_id->data; > > for_each_available_child_of_node(nfc->dev->of_node, child) { > -- Best regards, Marek Vasut