| Message ID | e3fXwH1TSclUunsB_ocTKA411JNgc8KozFJo9rGansdyTkxV-f6sj-TrJWBKXNs-DdlQTF-YEWRl_UcFQ_kQUCCEMsUUgnYQjiFrvWMrtYs=@ethancedwards.com |
|---|---|
| State | New |
| Headers | show |
| Series | cpufreq: sparc: change kzalloc to kcalloc | expand |
On 23-12-24, 14:41, Ethan Carter Edwards wrote: > Refactor to use kcalloc instead of kzalloc when multiplying > allocation size by count. This refactor prevents unintentional > memory overflows. Discovered by checkpatch.pl. > > Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com> > --- > drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +- > drivers/cpufreq/sparc-us3-cpufreq.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c > index 8a0cd5312a59..15899dd77c08 100644 > --- a/drivers/cpufreq/sparc-us2e-cpufreq.c > +++ b/drivers/cpufreq/sparc-us2e-cpufreq.c > @@ -323,7 +323,7 @@ static int __init us2e_freq_init(void) > impl = ((ver >> 32) & 0xffff); > > if (manuf == 0x17 && impl == 0x13) { > - us2e_freq_table = kzalloc(NR_CPUS * sizeof(*us2e_freq_table), > + us2e_freq_table = kcalloc(NR_CPUS, sizeof(*us2e_freq_table), > GFP_KERNEL); > if (!us2e_freq_table) > return -ENOMEM; > diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c > index b50f9d13e6d2..de50a2f3b124 100644 > --- a/drivers/cpufreq/sparc-us3-cpufreq.c > +++ b/drivers/cpufreq/sparc-us3-cpufreq.c > @@ -171,7 +171,7 @@ static int __init us3_freq_init(void) > impl == CHEETAH_PLUS_IMPL || > impl == JAGUAR_IMPL || > impl == PANTHER_IMPL)) { > - us3_freq_table = kzalloc(NR_CPUS * sizeof(*us3_freq_table), > + us3_freq_table = kcalloc(NR_CPUS, sizeof(*us3_freq_table), > GFP_KERNEL); > if (!us3_freq_table) > return -ENOMEM; Applied. Thanks. Though I failed to apply it directly using git/b4 for some reason, had to manually make the updates and commit.
diff --git a/drivers/cpufreq/sparc-us2e-cpufreq.c b/drivers/cpufreq/sparc-us2e-cpufreq.c index 8a0cd5312a59..15899dd77c08 100644 --- a/drivers/cpufreq/sparc-us2e-cpufreq.c +++ b/drivers/cpufreq/sparc-us2e-cpufreq.c @@ -323,7 +323,7 @@ static int __init us2e_freq_init(void) impl = ((ver >> 32) & 0xffff); if (manuf == 0x17 && impl == 0x13) { - us2e_freq_table = kzalloc(NR_CPUS * sizeof(*us2e_freq_table), + us2e_freq_table = kcalloc(NR_CPUS, sizeof(*us2e_freq_table), GFP_KERNEL); if (!us2e_freq_table) return -ENOMEM; diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c index b50f9d13e6d2..de50a2f3b124 100644 --- a/drivers/cpufreq/sparc-us3-cpufreq.c +++ b/drivers/cpufreq/sparc-us3-cpufreq.c @@ -171,7 +171,7 @@ static int __init us3_freq_init(void) impl == CHEETAH_PLUS_IMPL || impl == JAGUAR_IMPL || impl == PANTHER_IMPL)) { - us3_freq_table = kzalloc(NR_CPUS * sizeof(*us3_freq_table), + us3_freq_table = kcalloc(NR_CPUS, sizeof(*us3_freq_table), GFP_KERNEL); if (!us3_freq_table) return -ENOMEM;
Refactor to use kcalloc instead of kzalloc when multiplying allocation size by count. This refactor prevents unintentional memory overflows. Discovered by checkpatch.pl. Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com> --- drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +- drivers/cpufreq/sparc-us3-cpufreq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)