Allocate enough memory for pcpu_cp_time[] to stop sysctl() from
writing outside of array bounds. This fully fixes -P display on i386, where kern.cp_times prints zeroes for non-existing CPUs.
This commit is contained in:
parent
dca5e1abd5
commit
3aaa083285
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=178115
@ -312,6 +312,7 @@ machine_init(struct statics *statics, char do_unames)
|
||||
err(1, "malloc %zd bytes", size);
|
||||
if (sysctlbyname("kern.cp_times", times, &size, NULL, 0) == -1)
|
||||
err(1, "sysctlbyname kern.cp_times");
|
||||
pcpu_cp_time = calloc(1, size);
|
||||
maxid = (size / CPUSTATES / sizeof(long)) - 1;
|
||||
for (i = 0; i <= maxid; i++) {
|
||||
empty = 1;
|
||||
@ -335,7 +336,6 @@ machine_init(struct statics *statics, char do_unames)
|
||||
Header_lines += ncpus - 1; /* 7 */
|
||||
}
|
||||
size = sizeof(long) * ncpus * CPUSTATES;
|
||||
pcpu_cp_time = calloc(1, size);
|
||||
pcpu_cp_old = calloc(1, size);
|
||||
pcpu_cp_diff = calloc(1, size);
|
||||
pcpu_cpu_states = calloc(1, size);
|
||||
|
Loading…
Reference in New Issue
Block a user