forked from Minki/linux
0dfe54071d
The nodemask routines had mixed return values that provided potentially
signed return values that could never happen. This was leading to the
compiler getting confusing about the range of possible return values
(it was thinking things could be negative where they could not be). Fix
all the nodemask routines that should be returning unsigned
(or bool) values. Silences:
mm/swapfile.c: In function ‘setup_swap_info’:
mm/swapfile.c:2291:47: error: array subscript -1 is below array bounds of ‘struct plist_node[]’ [-Werror=array-bounds]
2291 | p->avail_lists[i].prio = 1;
| ~~~~~~~~~~~~~~^~~
In file included from mm/swapfile.c:16:
./include/linux/swap.h:292:27: note: while referencing ‘avail_lists’
292 | struct plist_node avail_lists[]; /*
| ^~~~~~~~~~~
Reported-by: Christophe de Dinechin <dinechin@redhat.com>
Link: https://lore.kernel.org/lkml/20220414150855.2407137-3-dinechin@redhat.com/
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Yury Norov <yury.norov@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Yury Norov <yury.norov@gmail.com>
32 lines
671 B
C
32 lines
671 B
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/nodemask.h>
|
|
#include <linux/module.h>
|
|
#include <linux/random.h>
|
|
|
|
unsigned int __next_node_in(int node, const nodemask_t *srcp)
|
|
{
|
|
unsigned int ret = __next_node(node, srcp);
|
|
|
|
if (ret == MAX_NUMNODES)
|
|
ret = __first_node(srcp);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(__next_node_in);
|
|
|
|
#ifdef CONFIG_NUMA
|
|
/*
|
|
* Return the bit number of a random bit set in the nodemask.
|
|
* (returns NUMA_NO_NODE if nodemask is empty)
|
|
*/
|
|
int node_random(const nodemask_t *maskp)
|
|
{
|
|
int w, bit = NUMA_NO_NODE;
|
|
|
|
w = nodes_weight(*maskp);
|
|
if (w)
|
|
bit = bitmap_ord_to_pos(maskp->bits,
|
|
get_random_int() % w, MAX_NUMNODES);
|
|
return bit;
|
|
}
|
|
#endif
|