diff options
| author |   Yury Norov <yury.norov@gmail.com> | 2022-09-19 14:05:54 -0700 |
|---|---|---|
| committer | Yury Norov <yury.norov@gmail.com> | 2022-10-01 10:22:57 -0700 |
| commit | 854701ba4c39afae2362ba19a580c461cb183e4f (patch) | |
| tree | dbfd1fc606cb607542cdcb61c2b1c9e56f41c81a /include/linux/netdevice.h | |
| parent | cpumask: add cpumask_nth_{,and,andnot} (diff) | |
| download | linux-dev-854701ba4c39afae2362ba19a580c461cb183e4f.tar.xz linux-dev-854701ba4c39afae2362ba19a580c461cb183e4f.zip | |
net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}
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>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 05d6f3facd5a..4d6d5a2dd82e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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, unsigned int nr_bits) { - /* -1 is a legal arg here. */ - if (n != -1) - cpu_max_bits_warn(n, nr_bits); + /* n is a prior cpu */ + cpu_max_bits_warn(n + 1, nr_bits); if (srcp) 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, unsigned int nr_bits) { - /* -1 is a legal arg here. */ - if (n != -1) - cpu_max_bits_warn(n, nr_bits); + /* n is a prior cpu */ + cpu_max_bits_warn(n + 1, nr_bits); if (src1p && src2p) return find_next_and_bit(src1p, src2p, nr_bits, n + 1); |