Use correct types for sizeof() in the calculations for the malloc(9) sizes [1].
While there, remove unneeded checks for failed allocations with M_WAITOK flag. Submitted by: Conrad Meyer <cemeyer@uw.edu> [1] MFC after: 1 week
This commit is contained in:
parent
9d2437a6f5
commit
cee9542d51
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=263080
@ -510,13 +510,8 @@ cpuctl_modevent(module_t mod __unused, int type, void *data __unused)
|
||||
}
|
||||
if (bootverbose)
|
||||
printf("cpuctl: access to MSR registers/cpuid info.\n");
|
||||
cpuctl_devs = (struct cdev **)malloc(sizeof(void *) * mp_ncpus,
|
||||
M_CPUCTL, M_WAITOK | M_ZERO);
|
||||
if (cpuctl_devs == NULL) {
|
||||
DPRINTF("[cpuctl,%d]: cannot allocate memory\n",
|
||||
__LINE__);
|
||||
return (ENOMEM);
|
||||
}
|
||||
cpuctl_devs = malloc(sizeof(*cpuctl_devs) * mp_ncpus, M_CPUCTL,
|
||||
M_WAITOK | M_ZERO);
|
||||
for (cpu = 0; cpu < mp_ncpus; cpu++)
|
||||
if (cpu_enabled(cpu))
|
||||
cpuctl_devs[cpu] = make_dev(&cpuctl_cdevsw, cpu,
|
||||
|
@ -1620,8 +1620,7 @@ pmc_p4_initialize(struct pmc_mdep *md, int ncpus)
|
||||
PMCDBG(MDP,INI,1, "%s", "p4-initialize");
|
||||
|
||||
/* Allocate space for pointers to per-cpu descriptors. */
|
||||
p4_pcpu = malloc(sizeof(struct p4_cpu **) * ncpus, M_PMC,
|
||||
M_ZERO|M_WAITOK);
|
||||
p4_pcpu = malloc(sizeof(*p4_pcpu) * ncpus, M_PMC, M_ZERO | M_WAITOK);
|
||||
|
||||
/* Fill in the class dependent descriptor. */
|
||||
pcd = &md->pmd_classdep[PMC_MDEP_CLASS_INDEX_P4];
|
||||
|
@ -725,14 +725,11 @@ linker_file_add_dependency(linker_file_t file, linker_file_t dep)
|
||||
linker_file_t *newdeps;
|
||||
|
||||
sx_assert(&kld_sx, SA_XLOCKED);
|
||||
newdeps = malloc((file->ndeps + 1) * sizeof(linker_file_t *),
|
||||
M_LINKER, M_WAITOK | M_ZERO);
|
||||
if (newdeps == NULL)
|
||||
return (ENOMEM);
|
||||
newdeps = malloc((file->ndeps + 1) * sizeof(*newdeps), M_LINKER,
|
||||
M_WAITOK | M_ZERO);
|
||||
|
||||
if (file->deps) {
|
||||
bcopy(file->deps, newdeps,
|
||||
file->ndeps * sizeof(linker_file_t *));
|
||||
bcopy(file->deps, newdeps, file->ndeps * sizeof(*newdeps));
|
||||
free(file->deps, M_LINKER);
|
||||
}
|
||||
file->deps = newdeps;
|
||||
|
Loading…
Reference in New Issue
Block a user