summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeyYoung Park <keyyoung.park@samsung.com>2012-05-30 10:29:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 00:32:18 +0200
commit7b15e1d9e342aca6c65f4824f1957f5245fcd87a (patch)
tree43f00f2aebac23208ab21135aed99cc48cba369f
parentserial: samsung: Fixed wrong comparison for baudclk_rate (diff)
downloadlinux-7b15e1d9e342aca6c65f4824f1957f5245fcd87a.tar.xz
linux-7b15e1d9e342aca6c65f4824f1957f5245fcd87a.zip
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>
-rw-r--r--drivers/tty/serial/samsung.c3
1 files changed, 2 insertions, 1 deletions
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);