diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2014-08-26 03:34:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-24 01:55:15 -0400 |
commit | 655e5b7c031e84cf8c07cfd6a5944ce53cba1add (patch) | |
tree | d99c06b802df92b1618fe67fe3a6a5e811b7b43b /drivers/base | |
parent | 833c95456a70826d1384883b73fd23aff24d366f (diff) |
drivers/base: Fix length checks in create_syslog_header()/dev_vprintk_emit()
snprintf() returns the number of bytes that could have been written
(excluding the null), not the actual number of bytes written. Given a
long enough subsystem or device name, these functions will advance
beyond the end of the on-stack buffer in dev_vprintk_exit(), resulting
in an information leak or stack corruption. I don't know whether such
a long name is currently possible.
In case snprintf() returns a value >= the buffer size, do not add
structured logging information. Also WARN if this happens, so we can
fix the driver or increase the buffer size.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 20da3ad1696b..28b808c73e8e 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -2007,6 +2007,8 @@ create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen) | |||
2007 | return 0; | 2007 | return 0; |
2008 | 2008 | ||
2009 | pos += snprintf(hdr + pos, hdrlen - pos, "SUBSYSTEM=%s", subsys); | 2009 | pos += snprintf(hdr + pos, hdrlen - pos, "SUBSYSTEM=%s", subsys); |
2010 | if (pos >= hdrlen) | ||
2011 | goto overflow; | ||
2010 | 2012 | ||
2011 | /* | 2013 | /* |
2012 | * Add device identifier DEVICE=: | 2014 | * Add device identifier DEVICE=: |
@@ -2038,7 +2040,14 @@ create_syslog_header(const struct device *dev, char *hdr, size_t hdrlen) | |||
2038 | "DEVICE=+%s:%s", subsys, dev_name(dev)); | 2040 | "DEVICE=+%s:%s", subsys, dev_name(dev)); |
2039 | } | 2041 | } |
2040 | 2042 | ||
2043 | if (pos >= hdrlen) | ||
2044 | goto overflow; | ||
2045 | |||
2041 | return pos; | 2046 | return pos; |
2047 | |||
2048 | overflow: | ||
2049 | dev_WARN(dev, "device/subsystem name too long"); | ||
2050 | return 0; | ||
2042 | } | 2051 | } |
2043 | 2052 | ||
2044 | int dev_vprintk_emit(int level, const struct device *dev, | 2053 | int dev_vprintk_emit(int level, const struct device *dev, |