Skip to contentSkip to conversation

fb_mmap() holding BKL

PATCH In review Paul Mundt 2 participants 2 messages Nov 14, 2001

lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

PATCH 1/1 fb_mmap() holding BKL

Hello,

Just a minor cleanup.. in the event of some sanity checking in fb_mmap(), the BKL is accidentally held on a return.. this trivial patch fixes this issue. (Against 2.4.14).

Please apply.

Regards,

Signature · 17 lines
Paul Mundt <[email protected]>
MontaVista Software, Inc.

--- linux/drivers/video/fbmem.c.orig	Wed Nov 14 15:17:40 2001
+++ linux/drivers/video/fbmem.c	Wed Nov 14 15:17:50 2001
@@ -563,8 +563,10 @@
 		/* memory mapped io */
 		off -= len;
 		fb->fb_get_var(&var, PROC_CONSOLE(info), info);
-		if (var.accel_flags)
+		if (var.accel_flags) {
+			unlock_kernel();
 			return -EINVAL;
+		}
 		start = fix.mmio_start;
 		len = PAGE_ALIGN((start & ~PAGE_MASK)+fix.mmio_len);
 	}
#1 lore raw
Quoted 2 lines · Paul Mundt

Just a minor cleanup.. in the event of some sanity checking in fb_mmap(), the BKL is accidentally held on a return.. this trivial patch fixes this issue.

No idea why your patch didn't apply here, but it didn't.

Attached is the same fix patch, rediff'd against 2.4.15-pre4.

Jeff

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno

Index: drivers/video/fbmem.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/drivers/video/fbmem.c,v retrieving revision 1.4

video/fbmem.c +3 -1
diff -u -r1.4 fbmem.c
@@ -563,8 +563,10 @@
 		/* memory mapped io */
 		off -= len;
 		fb->fb_get_var(&var, PROC_CONSOLE(info), info);
-		if (var.accel_flags)
+		if (var.accel_flags) {
+			unlock_kernel();
 			return -EINVAL;
+		}
 		start = fix.mmio_start;
 		len = PAGE_ALIGN((start & ~PAGE_MASK)+fix.mmio_len);
 	}