From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753301AbcHPIPk (ORCPT ); Tue, 16 Aug 2016 04:15:40 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36594 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbcHPIPe (ORCPT ); Tue, 16 Aug 2016 04:15:34 -0400 From: LABBE Corentin To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, LABBE Corentin Subject: [PATCH 2/2] mfd: mc13xxx: fix a possible NULL dereference Date: Tue, 16 Aug 2016 10:15:22 +0200 Message-Id: <1471335322-6814-2-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1471335322-6814-1-git-send-email-clabbe.montjoie@gmail.com> References: <1471335322-6814-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org of_match_device could return NULL, and so cause a NULL pointer dereference later. For fixing this problem, we use of_device_get_match_data(), this will simplify the code a little by using a standard function for getting the match data. Reported-by: coverity (CID 986513) Reported-by: coverity (CID 986514) Signed-off-by: LABBE Corentin --- drivers/mfd/mc13xxx-i2c.c | 4 +--- drivers/mfd/mc13xxx-spi.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c index 3c00ccb..8ad7593 100644 --- a/drivers/mfd/mc13xxx-i2c.c +++ b/drivers/mfd/mc13xxx-i2c.c @@ -78,9 +78,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client, } if (client->dev.of_node) { - const struct of_device_id *of_id = - of_match_device(mc13xxx_dt_ids, &client->dev); - mc13xxx->variant = of_id->data; + mc13xxx->variant = of_device_get_match_data(&client->dev); } else { mc13xxx->variant = (const struct mc13xxx_variant *)id->driver_data; } diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c index 6100025..3b4f5ba 100644 --- a/drivers/mfd/mc13xxx-spi.c +++ b/drivers/mfd/mc13xxx-spi.c @@ -155,10 +155,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi) } if (spi->dev.of_node) { - const struct of_device_id *of_id = - of_match_device(mc13xxx_dt_ids, &spi->dev); - - mc13xxx->variant = of_id->data; + mc13xxx->variant = of_device_get_match_data(&spi->dev); } else { const struct spi_device_id *id_entry = spi_get_device_id(spi); -- 2.7.3