lkml.org 
[lkml]   [2022]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/7] net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}
Date
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).

Signed-off-by: Yury Norov <yury.norov@gmail.com>
---
include/linux/netdevice.h | 10 ++++------
1 file 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);
--
2.34.1
\
 
 \ /
  Last update: 2022-09-19 23:07    [W:0.287 / U:0.428 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site