diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2011-01-30 10:31:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-01 14:17:51 -0800 |
| commit | a29ae23f687649c35b1520a8f986497637a0cc62 (patch) | |
| tree | 23590d84873e98c1eef7ca50e5d78bd3ad4b2f6e /drivers/isdn | |
| parent | d9c8f498c3b41e686d3306dcf01d95941fcc6b48 (diff) | |
| download | op-kernel-dev-a29ae23f687649c35b1520a8f986497637a0cc62.zip op-kernel-dev-a29ae23f687649c35b1520a8f986497637a0cc62.tar.gz | |
isdn: icn: Fix potentially wrong string handling
This warning was reported by cppcheck:
drivers/isdn/icn/icn.c:1641: error: Dangerous usage of 'rev' (strncpy doesn't always 0-terminate it)
If strncpy copied 20 bytes, the destination string rev was not terminated.
The patch adds one more byte to rev and makes sure that this byte is
always 0.
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tejun Heo <tj@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/icn/icn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c index f2b5bab..1f355bb 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/isdn/icn/icn.c @@ -1627,7 +1627,7 @@ __setup("icn=", icn_setup); static int __init icn_init(void) { char *p; - char rev[20]; + char rev[21]; memset(&dev, 0, sizeof(icn_dev)); dev.memaddr = (membase & 0x0ffc000); @@ -1638,6 +1638,7 @@ static int __init icn_init(void) if ((p = strchr(revision, ':'))) { strncpy(rev, p + 1, 20); + rev[20] = '\0'; p = strchr(rev, '$'); if (p) *p = 0; |
