From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932258AbcHPJ1d (ORCPT ); Tue, 16 Aug 2016 05:27:33 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33422 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753240AbcHPJ1a (ORCPT ); Tue, 16 Aug 2016 05:27:30 -0400 From: LABBE Corentin To: plagnioj@jcrosoft.com, tomi.valkeinen@ti.com Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, LABBE Corentin Subject: [PATCH 2/2] fbdev: ssd1307fb: fix a possible NULL dereference Date: Tue, 16 Aug 2016 11:27:18 +0200 Message-Id: <1471339638-25134-2-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1471339638-25134-1-git-send-email-clabbe.montjoie@gmail.com> References: <1471339638-25134-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. Signed-off-by: LABBE Corentin --- drivers/video/fbdev/ssd1307fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index b6c9ecf..4265035 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -559,8 +559,7 @@ static int ssd1307fb_probe(struct i2c_client *client, par->info = info; par->client = client; - par->device_info = of_match_device(ssd1307fb_of_match, - &client->dev)->data; + par->device_info = of_device_get_match_data(&client->dev); par->reset = of_get_named_gpio(client->dev.of_node, "reset-gpios", 0); -- 2.7.3