Skip to content

Commit 3b7ff5e

Browse files
htejungregkh
authored andcommitted
cpumask: use nr_cpumask_bits for parsing functions
commit 4d59b6ccf000862beed6fc0765d3209f98a8d8a2 upstream. Commit 513e3d2 ("cpumask: always use nr_cpu_ids in formatting and parsing functions") converted both cpumask printing and parsing functions to use nr_cpu_ids instead of nr_cpumask_bits. While this was okay for the printing functions as it just picked one of the two output formats that we were alternating between depending on a kernel config, doing the same for parsing wasn't okay. nr_cpumask_bits can be either nr_cpu_ids or NR_CPUS. We can always use nr_cpu_ids but that is a variable while NR_CPUS is a constant, so it can be more efficient to use NR_CPUS when we can get away with it. Converting the printing functions to nr_cpu_ids makes sense because it affects how the masks get presented to userspace and doesn't break anything; however, using nr_cpu_ids for parsing functions can incorrectly leave the higher bits uninitialized while reading in these masks from userland. As all testing and comparison functions use nr_cpumask_bits which can be larger than nr_cpu_ids, the parsed cpumasks can erroneously yield false negative results. This made the taskstats interface incorrectly return -EINVAL even when the inputs were correct. Fix it by restoring the parse functions to use nr_cpumask_bits instead of nr_cpu_ids. Link: http://lkml.kernel.org/r/20170206182442.GB31078@htj.duckdns.org Fixes: 513e3d2 ("cpumask: always use nr_cpu_ids in formatting and parsing functions") Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Martin Steigerwald <martin.steigerwald@teamix.de> Debugged-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fd96835 commit 3b7ff5e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

include/linux/cpumask.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ static inline void cpumask_copy(struct cpumask *dstp,
556556
static inline int cpumask_parse_user(const char __user *buf, int len,
557557
struct cpumask *dstp)
558558
{
559-
return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpu_ids);
559+
return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpumask_bits);
560560
}
561561

562562
/**
@@ -571,7 +571,7 @@ static inline int cpumask_parselist_user(const char __user *buf, int len,
571571
struct cpumask *dstp)
572572
{
573573
return bitmap_parselist_user(buf, len, cpumask_bits(dstp),
574-
nr_cpu_ids);
574+
nr_cpumask_bits);
575575
}
576576

577577
/**
@@ -586,7 +586,7 @@ static inline int cpumask_parse(const char *buf, struct cpumask *dstp)
586586
char *nl = strchr(buf, '\n');
587587
unsigned int len = nl ? (unsigned int)(nl - buf) : strlen(buf);
588588

589-
return bitmap_parse(buf, len, cpumask_bits(dstp), nr_cpu_ids);
589+
return bitmap_parse(buf, len, cpumask_bits(dstp), nr_cpumask_bits);
590590
}
591591

592592
/**
@@ -598,7 +598,7 @@ static inline int cpumask_parse(const char *buf, struct cpumask *dstp)
598598
*/
599599
static inline int cpulist_parse(const char *buf, struct cpumask *dstp)
600600
{
601-
return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpu_ids);
601+
return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpumask_bits);
602602
}
603603

604604
/**

0 commit comments

Comments
 (0)