Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754358AbbFKNNe (ORCPT <rfc822;w@1wt.eu>);
	Thu, 11 Jun 2015 09:13:34 -0400
Received: from mail-out.m-online.net ([212.18.0.9]:37735 "EHLO
	mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752445AbbFKNNU (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 11 Jun 2015 09:13:20 -0400
X-Auth-Info: dqsdXF5FyrDN4U/WSVLyv8QGMIBGxb/7NzlCjOihbk8=
From: Heiko Schocher <hs@denx.de>
To: linux-fbdev@vger.kernel.org
Cc: Heiko Schocher <hs@denx.de>, devicetree@vger.kernel.org,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>,
        linux-kernel@vger.kernel.org, Tomi Valkeinen <tomi.valkeinen@ti.com>,
        Grant Likely <grant.likely@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
        Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] video: sm501fb: fixing static checker warning
Date: Thu, 11 Jun 2015 15:13:13 +0200
Message-Id: <1434028393-32224-1-git-send-email-hs@denx.de>
X-Mailer: git-send-email 2.1.0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1919
Lines: 61

Dan Carpenter reported the static checker warning:

drivers/video/fbdev/sm501fb.c:1958 sm501fb_probe()
warn: strcpy() 'cp' of unknown size might be too large for 'fb_mode'

Fix it, as the SM501 datasheet says the SM501 can "200 MHz
DAC support 1280x1024 resolution", which would result in a
too long mode string for current fb_mode var.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
---

 drivers/video/fbdev/sm501fb.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index 9e74e8f..ea50df3 100644
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -43,7 +43,9 @@
 
 #include "edid.h"
 
-static char *fb_mode = "640x480-16@60";
+static char *fb_default_mode = "640x480-16@60";
+static char fb_mode[20];
+static char *fb_mode_cmdline;
 static unsigned long default_bpp = 16;
 
 static struct fb_videomode sm501_default_mode = {
@@ -1963,6 +1965,12 @@ static int sm501fb_probe(struct platform_device *pdev)
 				if (info->edid_data)
 					found = 1;
 			}
+		} else {
+			if (fb_mode_cmdline)
+				strncpy(fb_mode, fb_mode_cmdline,
+					sizeof(fb_mode) - 1);
+			else
+				strcpy(fb_mode, fb_default_mode);
 		}
 #endif
 		if (!found) {
@@ -2230,7 +2238,7 @@ static struct platform_driver sm501fb_driver = {
 
 module_platform_driver(sm501fb_driver);
 
-module_param_named(mode, fb_mode, charp, 0);
+module_param_named(mode, fb_mode_cmdline, charp, 0);
 MODULE_PARM_DESC(mode,
 	"Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
 module_param_named(bpp, default_bpp, ulong, 0);
-- 
2.1.0

--
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/