svn commit: r300585 - stable/10/sys/dev/fb

Alexander Motin mav at FreeBSD.org
Tue May 24 07:17:11 UTC 2016


Author: mav
Date: Tue May 24 07:17:09 2016
New Revision: 300585
URL: https://svnweb.freebsd.org/changeset/base/300585

Log:
  MFC r300072: Fix NULL-dereference panic if VESA reports zero modes.

Modified:
  stable/10/sys/dev/fb/vesa.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/fb/vesa.c
==============================================================================
--- stable/10/sys/dev/fb/vesa.c	Tue May 24 07:15:53 2016	(r300584)
+++ stable/10/sys/dev/fb/vesa.c	Tue May 24 07:17:09 2016	(r300585)
@@ -1026,7 +1026,8 @@ vesa_bios_init(void)
 
 		++modes;
 	}
-	vesa_vmode[modes].vi_mode = EOT;
+	if (vesa_vmode != NULL)
+		vesa_vmode[modes].vi_mode = EOT;
 
 	if (bootverbose)
 		printf("VESA: %d mode(s) found\n", modes);


More information about the svn-src-all mailing list