Date: Thu, 18 Dec 2014 23:00:18 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275921 - stable/10/sys/i386/i386 Message-ID: <201412182300.sBIN0Iig038576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Thu Dec 18 23:00:17 2014 New Revision: 275921 URL: https://svnweb.freebsd.org/changeset/base/275921 Log: MFC 273871: Skip the smap sysctl instead of panicing if no kernel metadata can be found. Modified: stable/10/sys/i386/i386/machdep.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/i386/i386/machdep.c ============================================================================== --- stable/10/sys/i386/i386/machdep.c Thu Dec 18 22:32:22 2014 (r275920) +++ stable/10/sys/i386/i386/machdep.c Thu Dec 18 23:00:17 2014 (r275921) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412182300.sBIN0Iig038576>