Commit b5122289 authored by Tariq Toukan's avatar Tariq Toukan Committed by Yongqiang Liu
Browse files

net: Fix features skip in for_each_netdev_feature() 

stable inclusion
from stable-4.19.244
commit 48fed355543418c34de4b521365f438041523a1d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5A6BA


CVE: NA

--------------------------------

[ Upstream commit 85db6352 ]

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: 3b89ea9c ("net: Fix for_each_netdev_feature on Big endian")
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Link: https://lore.kernel.org/r/20220504080914.1918-1-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent eed7081d

include/linux/netdev_features.h

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ enum { 
#define NETIF_F_HW_TLS_TX	__NETIF_F(HW_TLS_TX)

#define NETIF_F_HW_TLS_RX	__NETIF_F(HW_TLS_RX)



/* 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)

{
@@ -175,7 +175,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 */