Hi,
On Wed, 9 May 2018, Stanislav Brabec wrote:
> diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
> index 12e52d887..f32b7a6fc 100644
> --- a/sys-utils/chcpu.c
> +++ b/sys-utils/chcpu.c
> @@ -81,7 +81,7 @@ static int cpu_enable(cpu_set_t *cpu_set, size_t setsize, int enable)
> size_t fails = 0;
>
> for (cpu = 0; cpu < setsize; cpu++) {
> - if (!CPU_ISSET(cpu, cpu_set))
> + if (!CPU_ISSET_S(cpu, setsize, cpu_set))
Careful, the _S macros count the size in _bytes_, the above loop iterates
in nr-of-cpus (i.e. bits), or alternatively if the caller really gives a
byte size then the loop iterations don't catch all CPUs. More instances
follow.
> diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
> index 2132511a5..fd6d63bbf 100644
> --- a/sys-utils/lscpu.c
> +++ b/sys-utils/lscpu.c
> @@ -478,7 +478,7 @@ read_basicinfo(struct lscpu_desc *desc, struct lscpu_modifier *mod)
> desc->idx2cpunum = xcalloc(desc->ncpuspos, sizeof(int));
>
> for (num = 0, idx = 0; num < maxcpus; num++) {
> - if (CPU_ISSET(num, tmp))
> + if (CPU_ISSET_S(num, setsize, tmp))
> desc->idx2cpunum[idx++] = num;
> }
> cpuset_free(tmp);
> @@ -1109,10 +1109,11 @@ cpu_max_mhz(struct lscpu_desc *desc, char *buf, size_t bufsz)
> {
> int i;
> float cpu_freq = 0.0;
> + size_t setsize = CPU_ALLOC_SIZE(maxcpus);
>
> if (desc->present) {
> for (i = 0; i < desc->ncpuspos; i++) {
> - if (CPU_ISSET(real_cpu_num(desc, i), desc->present)
> + if (CPU_ISSET_S(real_cpu_num(desc, i), setsize, desc->present)
This here is okay, though, CPU_ALLOC_SIZE also counts in bytes.
Ciao,
Michael.
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
