Author: jhb
Date: Thu Oct 30 17:58:57 2014
New Revision: 273871
URL: https://svnweb.freebsd.org/changeset/base/273871

Log:
  Skip the smap sysctl instead of panicing if no kernel metadata can be
  found.
  
  Submitted by: bde
  MFC after:    3 days

Modified:
  head/sys/i386/i386/machdep.c

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c        Thu Oct 30 17:14:51 2014        
(r273870)
+++ head/sys/i386/i386/machdep.c        Thu Oct 30 17:58:57 2014        
(r273871)
@@ -3428,6 +3428,8 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
        kmdp = preload_search_by_type("elf kernel");
        if (kmdp == NULL)
                kmdp = preload_search_by_type("elf32 kernel");
+       if (kmdp == NULL)
+               return (0);
        smapbase = (struct bios_smap *)preload_search_info(kmdp,
            MODINFO_METADATA | MODINFOMD_SMAP);
        if (smapbase == NULL)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to