From: KeyYoung Park <keyyoung.park@samsung.com>
Date: Wed, 30 May 2012 08:29:55 +0000 (+0900)
Subject: serial: samsung: protect NULL dereference of clock name
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7b15e1d9e342aca6c65f4824f1957f5245fcd87a;p=deliverable%2Flinux.git

serial: samsung: protect NULL dereference of clock name

When priting the serial clock source, if clock source name is null,
kernel reference NULL point.

Signed-off-by: KeyYoung Park <keyyoung.park@samsung.com>
Signed-off-by: Huisung Kang <hs1218.kang@samsung.com>
Signed-off-by: Kyoungil Kim <ki0351.kim@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index cefdd2d7c58c..d57f165d6be8 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1162,7 +1162,8 @@ static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
 	if (IS_ERR(ourport->baudclk))
 		return -EINVAL;
 
-	return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->baudclk->name);
+	return snprintf(buf, PAGE_SIZE, "* %s\n",
+			ourport->baudclk->name ?: "(null)");
 }
 
 static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);