summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Keil <kkeil@suse.de>2008-01-25 13:42:23 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-08 12:01:48 -0800
commit0bf056904b95fa555c36eb0cfbcee9c015747f59 (patch)
treed8ade02d189dc8dbb82650054a74ddddd21d706b
parent236dd7e3143e79b216e9f51e2488f9e3a60b4161 (diff)
downloadlinux-stable-0bf056904b95fa555c36eb0cfbcee9c015747f59.tar.gz
linux-stable-0bf056904b95fa555c36eb0cfbcee9c015747f59.tar.bz2
linux-stable-0bf056904b95fa555c36eb0cfbcee9c015747f59.zip
fix oops on rmmod capidrv
patch eb36f4fc019835cecf0788907f6cab774508087b in mainline. Fix overwriting the stack with the version string (it is currently 10 bytes + zero) when unloading the capidrv module. Safeguard against overwriting it should the version string grow in the future. Should fix Kernel Bug Tracker Bug 9696. Signed-off-by: Gerd v. Egidy <gerd.von.egidy@intra2net.com> Acked-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/isdn/capi/capidrv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 23b6f7bc16b7..f65b7f9d3f43 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -2306,13 +2306,14 @@ static int __init capidrv_init(void)
static void __exit capidrv_exit(void)
{
- char rev[10];
+ char rev[32];
char *p;
if ((p = strchr(revision, ':')) != 0) {
- strcpy(rev, p + 1);
- p = strchr(rev, '$');
- *p = 0;
+ strncpy(rev, p + 1, sizeof(rev));
+ rev[sizeof(rev)-1] = 0;
+ if ((p = strchr(rev, '$')) != 0)
+ *p = 0;
} else {
strcpy(rev, " ??? ");
}