From 39d22d86ab05fb09689a9882909dfd35ab546ade Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 30 Oct 2014 17:58:57 +0000 Subject: [PATCH] Skip the smap sysctl instead of panicing if no kernel metadata can be found. Submitted by: bde MFC after: 3 days --- sys/i386/i386/machdep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index efe999a7cd3..0604c0d6440 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -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)