leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}

Browse Source 
The functions require to be passed with a cpu index prior to one that is
the first to start search, so the valid input range is [-1, nr_cpu_ids-1).
However, the code checks against [-1, nr_cpu_ids).

Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Yury Norov <yury.norov@gmail.com>
This commit is contained in:
Yury Norov 2022-09-19 14:05:54 -07:00
parent 944c417dae
commit 854701ba4c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/netdevice.h
View File

@ -3643,9 +3643,8 @@ static inline bool netif_attr_test_online(unsigned long j,
static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp, static inline unsigned int netif_attrmask_next(int n, const unsigned long *srcp,
unsigned int nr_bits) unsigned int nr_bits)
{ {
/* -1 is a legal arg here. */ /* n is a prior cpu */
if (n != -1) cpu_max_bits_warn(n + 1, nr_bits);
cpu_max_bits_warn(n, nr_bits);
if (srcp) if (srcp)
return find_next_bit(srcp, nr_bits, n + 1); return find_next_bit(srcp, nr_bits, n + 1);
@ -3666,9 +3665,8 @@ static inline int netif_attrmask_next_and(int n, const unsigned long *src1p,
const unsigned long *src2p, const unsigned long *src2p,
unsigned int nr_bits) unsigned int nr_bits)
{ {
/* -1 is a legal arg here. */ /* n is a prior cpu */
if (n != -1) cpu_max_bits_warn(n + 1, nr_bits);
cpu_max_bits_warn(n, nr_bits);
if (src1p && src2p) if (src1p && src2p)
return find_next_and_bit(src1p, src2p, nr_bits, n + 1); return find_next_and_bit(src1p, src2p, nr_bits, n + 1);