Skip to contentSkip to conversation

fix oops on rmmod capidrv

PATCH In review Gerd v. Egidy 2 participants 3 messages Jan 24, 2008 – Apr 29, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix oops on rmmod capidrv

Hi,

I think the patch below fixes a long-standing bug on rmmod capidrv. Please apply.

Kind regards,

Gerd

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.

diff -r -u linux-2.6.23.orig/drivers/isdn/capi/capidrv.c linux-2.6.23/drivers/isdn/capi/capidrv.c

drivers/isdn/capi/capidrv.c +5 -4
@@ -2306,13 +2306,14 @@
 
 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, " ??? ");
 	}
author Acked-by Karsten Keil on v1 1/1
#1 lore raw

Hi,

my patch below was added to 2.6.23.15 and linus tree that became 2.6.25, but was too late for 2.6.24. So if you consider another stable release for 2.6.24 you might want to add that patch too.

Kind regards,

Gerd

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.

drivers/isdn/capi/capidrv.c +5 -4
@@ -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, " ??? ");
 	}
Signature · 2 lines
Address (better: trap) for people I really don't want to get mail from:
[email protected]
#2 lore raw
Quoted 5 lines · Gerd v. Egidy

Hi,

my patch below was added to 2.6.23.15 and linus tree that became 2.6.25, but was too late for 2.6.24. So if you consider another stable release for 2.6.24 you might want to add that patch too.

Now added to the queue.

thanks,

greg k-h