Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754883AbaGBVnl (ORCPT ); Wed, 2 Jul 2014 17:43:41 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:46658 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512AbaGBVnj (ORCPT ); Wed, 2 Jul 2014 17:43:39 -0400 From: Rickard Strandqvist To: Jean-Christophe Plagniol-Villard , Tomi Valkeinen Cc: Rickard Strandqvist , Jingoo Han , Daniel Vetter , Laurent Pinchart , Rob Clark , David Ung , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] video: fbdev: core: fbmon.c: Fix for possible null pointer dereference Date: Wed, 2 Jul 2014 23:44:53 +0200 Message-Id: <1404337493-6416-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a possible null pointer dereference, there is otherwise a risk of a possible null pointer dereference This was found using a static code analysis program called cppcheck Signed-off-by: Rickard Strandqvist --- drivers/video/fbdev/core/fbmon.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 5b0e313..9ec81ee 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -608,6 +608,11 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize) int num = 0, i, first = 1; int ver, rev; + if (edid == NULL || !edid_checksum(edid) || + !edid_check_header(edid)) { + return NULL; + } + ver = edid[EDID_STRUCT_VERSION]; rev = edid[EDID_STRUCT_REVISION]; @@ -615,12 +620,6 @@ static struct fb_videomode *fb_create_modedb(unsigned char *edid, int *dbsize) if (mode == NULL) return NULL; - if (edid == NULL || !edid_checksum(edid) || - !edid_check_header(edid)) { - kfree(mode); - return NULL; - } - *dbsize = 0; DPRINTK(" Detailed Timings\n"); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/