From 3f663b8b407d2e2a58343fae3f875fea4e84fcff Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 18 Dec 2014 23:00:17 +0000 Subject: MFC 273871: Skip the smap sysctl instead of panicing if no kernel metadata can be found. --- sys/i386/i386/machdep.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/i386/i386') diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index ec435c1..1e1889a 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -3117,6 +3117,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) -- cgit v1.1