Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754500AbdGJPSf (ORCPT ); Mon, 10 Jul 2017 11:18:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:43320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753834AbdGJPSe (ORCPT ); Mon, 10 Jul 2017 11:18:34 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9CF322C93 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=atull@kernel.org MIME-Version: 1.0 In-Reply-To: <20170707062214.GA16142@embeddedgus> References: <20170707062214.GA16142@embeddedgus> From: Alan Tull Date: Mon, 10 Jul 2017 10:17:52 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] fpga: altera-hps2fpga: add NULL check on of_match_device() return value To: "Gustavo A. R. Silva" Cc: Moritz Fischer , linux-fpga@vger.kernel.org, linux-kernel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1129 Lines: 41 On Fri, Jul 7, 2017 at 1:22 AM, Gustavo A. R. Silva Hi Gustavo, Thanks for the fix! Alan wrote: > Check return value from call to of_match_device() > in order to prevent a NULL pointer dereference. > > In case of NULL print error message and return -ENODEV > > Signed-off-by: Gustavo A. R. Silva Acked-by: Alan Tull > --- > drivers/fpga/altera-hps2fpga.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c > index 3066b80..ca8212c 100644 > --- a/drivers/fpga/altera-hps2fpga.c > +++ b/drivers/fpga/altera-hps2fpga.c > @@ -143,6 +143,11 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev) > int ret; > > of_id = of_match_device(altera_fpga_of_match, dev); > + if (!of_id) { > + dev_err(dev, "failed to match device\n"); > + return -ENODEV; > + } > + > priv = (struct altera_hps2fpga_data *)of_id->data; > > priv->bridge_reset = of_reset_control_get_by_index(dev->of_node, 0); > -- > 2.5.0 >