[PATCH] fb_mmap() holding BKL

[PATCH] fb_mmap() holding BKL

[Paul Mundt]

[-- Attachment #1: Type: text/plain, Size: 711 bytes --]

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,

-- 
Paul Mundt <pmundt@mvista.com>
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);
 	}

[-- Attachment #2: Type: application/pgp-signature, Size: 240 bytes --]

Re: [PATCH] fb_mmap() holding BKL

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Paul Mundt wrote:
> 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


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

[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 596 bytes --]

Index: drivers/video/fbmem.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_4/drivers/video/fbmem.c,v
retrieving revision 1.4
diff -u -r1.4 fbmem.c
--- drivers/video/fbmem.c	2001/10/11 09:39:14	1.4
+++ drivers/video/fbmem.c	2001/11/14 23:31:44
@@ -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);
 	}