DRM bugfix

[Abraham vd Merwe]

--p4qYPpj5QlsIQJ0K
Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx"
Content-Disposition: inline

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

Hi!

I found a small bug in drm_proc.h. DRM(_vm_info) tries to access
dev->maplist, but dev->maplist is only intitialized when the device is
opened, so if you do a cat /proc/dri/0/vm just after you load any DRM module
(just before loading X), you'll get an oops and mess up the whole proc
system in the process...

I've attached a fix for it. The patch is against the 2.4.10 kernel, but I
think drm_proc.h in the 2.4.10 kernel is the same as in the DRI CVS
repository.

--=20

Regards
 Abraham

One can never consent to creep when one feels an impulse to soar.
		-- Helen Keller

__________________________________________________________
 Abraham vd Merwe - 2d3D, Inc.

 Device Driver Development, Outsourcing, Embedded Systems

  Cell: [phone]         Snailmail:
   Tel: [phone]            Block C, Antree Park
   Fax: [phone]            Doncaster Road
 Email: [e-mail]         Kenilworth, 7700
  Http: http://www.2d3d.com        South Africa

--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="maplist-fix.diff"

diff -Nrup linux-2.4.10.orig/drivers/char/drm/drm_proc.h linux-2.4.10/drivers/char/drm/drm_proc.h
--- linux-2.4.10.orig/drivers/char/drm/drm_proc.h	Wed Aug 15 23:21:47 2001
+++ linux-2.4.10/drivers/char/drm/drm_proc.h	Fri Oct  5 13:33:54 2001
@@ -186,7 +186,7 @@ static int DRM(_vm_info)(char *buf, char
 	DRM_PROC_PRINT("slot	 offset	      size type flags	 "
 		       "address mtrr\n\n");
 	i = 0;
-	list_for_each(list, &dev->maplist->head) {
+	if (dev->maplist != NULL) list_for_each(list, &dev->maplist->head) {
 		r_list = (drm_map_list_t *)list;
 		map = r_list->map;
 		if(!map) continue;

--zYM0uCDKw75PZbzx--

--p4qYPpj5QlsIQJ0K
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQE7vZvqzNXhP0RCUqMRAoRkAJsGwbEudie6gUr79w+fglximJhjMwCeNrbU
GRXFAXiTFWgc35sPaK/LDh8=
=97v3
-----END PGP SIGNATURE-----

--p4qYPpj5QlsIQJ0K--