Date: Wed, 14 Nov 2001 15:26:56 -0800
From: Paul Mundt <pmundt@mvista.com>
To: torvalds@transmeta.com
Cc: linux-kernel@vger.kernel.org, linux-fbdev-devel@lists.sourceforge.net
Subject: [PATCH] fb_mmap() holding BKL
Message-ID: <20011114152656.A31149@mvista.com>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="XsQoSWH+UP9D9v3l"
Content-Disposition: inline
User-Agent: Mutt/1.3.16i
Organization: MontaVista Software, Inc.
Sender: linux-kernel-owner@vger.kernel.org


--XsQoSWH+UP9D9v3l
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello,

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

Please apply.

Regards,

--=20
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 -=3D len;
 		fb->fb_get_var(&var, PROC_CONSOLE(info), info);
-		if (var.accel_flags)
+		if (var.accel_flags) {
+			unlock_kernel();
 			return -EINVAL;
+		}
 		start =3D fix.mmio_start;
 		len =3D PAGE_ALIGN((start & ~PAGE_MASK)+fix.mmio_len);
 	}

--XsQoSWH+UP9D9v3l
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.5 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iEYEARECAAYFAjvy/b8ACgkQYLvqhoOEA4G0CwCeNsBRQYsr3dXwSwlqf/iHRZ21
GGEAn35/tK2fLx0kahmhVxsq0+t+K7cL
=vpnb
-----END PGP SIGNATURE-----

--XsQoSWH+UP9D9v3l--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/