diff options
author | Karsten Keil <kkeil@suse.de> | 2008-01-25 05:55:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 11:26:10 -0500 |
commit | eb36f4fc019835cecf0788907f6cab774508087b (patch) | |
tree | b834e3213c822735006c25f0c4f6e4ed6cafc181 /drivers/isdn | |
parent | 49914084e797530d9baaf51df9eda77babc98fa8 (diff) |
fix oops on rmmod capidrv
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>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/capi/capidrv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 48c1775ef5b3..cb42b690b45e 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
@@ -2332,13 +2332,14 @@ static int __init capidrv_init(void) | |||
2332 | 2332 | ||
2333 | static void __exit capidrv_exit(void) | 2333 | static void __exit capidrv_exit(void) |
2334 | { | 2334 | { |
2335 | char rev[10]; | 2335 | char rev[32]; |
2336 | char *p; | 2336 | char *p; |
2337 | 2337 | ||
2338 | if ((p = strchr(revision, ':')) != 0) { | 2338 | if ((p = strchr(revision, ':')) != 0) { |
2339 | strcpy(rev, p + 1); | 2339 | strncpy(rev, p + 1, sizeof(rev)); |
2340 | p = strchr(rev, '$'); | 2340 | rev[sizeof(rev)-1] = 0; |
2341 | *p = 0; | 2341 | if ((p = strchr(rev, '$')) != 0) |
2342 | *p = 0; | ||
2342 | } else { | 2343 | } else { |
2343 | strcpy(rev, " ??? "); | 2344 | strcpy(rev, " ??? "); |
2344 | } | 2345 | } |