Skip to contentSkip to conversation

net: Fix features skip in for_each_netdev_feature()

PATCH Applied Tariq Toukan 3 participants 3 messages May 4, 2022 – May 6, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Fix features skip in for_each_netdev_feature()

The find_next_netdev_feature() macro gets the "remaining length", not bit index.
Passing "bit - 1" for the following iteration is wrong as it skips the adjacent bit. Pass "bit" instead.

Fixes 3b89ea9c5902 ("net: Fix for_each_netdev_feature on Big endian")
---
 include/linux/netdev_features.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Hi,
Please queue to -stable >= v5.0.

include/linux/netdev_features.h +2 -2
index 2c6b9e416225..7c2d77d75a88 100644
@@ -169,7 +169,7 @@ enum {
 #define NETIF_F_HW_HSR_FWD	__NETIF_F(HW_HSR_FWD)
 #define NETIF_F_HW_HSR_DUP	__NETIF_F(HW_HSR_DUP)
 
-/* Finds the next feature with the highest number of the range of start till 0.
+/* Finds the next feature with the highest number of the range of start-1 till 0.
  */
 static inline int find_next_netdev_feature(u64 feature, unsigned long start)
 {
@@ -188,7 +188,7 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start)
 	for ((bit) = find_next_netdev_feature((mask_addr),		\
 					      NETDEV_FEATURE_COUNT);	\
 	     (bit) >= 0;						\
-	     (bit) = find_next_netdev_feature((mask_addr), (bit) - 1))
+	     (bit) = find_next_netdev_feature((mask_addr), (bit)))
 
 /* Features valid for ethtool to change */
 /* = all defined minus driver/device-class-related */
Signature · 1 line
2.21.0
maintainer
#1 lore raw
Quoted 8 lines · On Wed, 4 May 2022 11:09:14 +0300 Tariq Toukan wrote:

The find_next_netdev_feature() macro gets the "remaining length", not bit index.
Passing "bit - 1" for the following iteration is wrong as it skips the adjacent bit. Pass "bit" instead.

Fixes 3b89ea9c5902 ("net: Fix for_each_netdev_feature on Big endian")
Quoted 6 lines
---
 include/linux/netdev_features.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Hi,
Please queue to -stable >= v5.0.

You can add the normal Cc: stable tags in networking these days, the rules were updated.

But I'll forgo doing that here since your >= 5.0 is incorrect, looks like the bad commit got backported to earlier stable branches. Greg will probably do the right thing based on the Fixes tag, anyway.

#2 lore raw
In reply to Tariq Toukan
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Wed, 4 May 2022 11:09:14 +0300 you wrote:

The find_next_netdev_feature() macro gets the "remaining length", not bit index.
Passing "bit - 1" for the following iteration is wrong as it skips the adjacent bit. Pass "bit" instead.

Fixes 3b89ea9c5902 ("net: Fix for_each_netdev_feature on Big endian")

[...]

Here is the summary with links:
- [net] net: Fix features skip in for_each_netdev_feature()

    https://git.kernel.org/netdev/net/c/85db6352fc8a

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html