Author: mmokhi (ports committer)
Date: Fri Jun 23 10:36:27 2017
New Revision: 320265
URL: https://svnweb.freebsd.org/changeset/base/320265

Log:
  Fix caveat in new implementation of linprocfs_docpuinfo():
  Prevent kernel panic in case that extended-cpuid isn't supported by CPU
  
  Reviewed by:  kib, ngie, trasz
  Approved by:  trasz
  MFC after:    1 week
  Differential Revision:        https://reviews.freebsd.org/D11294

Modified:
  head/sys/compat/linprocfs/linprocfs.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c       Fri Jun 23 10:09:49 2017        
(r320264)
+++ head/sys/compat/linprocfs/linprocfs.c       Fri Jun 23 10:36:27 2017        
(r320265)
@@ -245,7 +245,10 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
                break;
        }
 #endif
-       do_cpuid(0x80000006, cache_size);
+       if (cpu_exthigh >= 0x80000006)
+               do_cpuid(0x80000006, cache_size);
+       else
+               memset(cache_size, 0, sizeof(cache_size));
        for (i = 0; i < mp_ncpus; ++i) {
                fqmhz = 0;
                fqkhz = 0;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to