Skip to contentSkip to conversation

nexthop: Fix attribute checking for groups

PATCH In review David Ahern 2 participants 2 messages May 17, 2020

Subsystems (3)
lore
Share & tools
lore

David Ahern

author maintainer
#0 lore raw

PATCH 1/1 nexthop: Fix attribute checking for groups

From: David Ahern <[email protected]>

For nexthop groups, attributes after NHA_GROUP_TYPE are invalid, but nh_check_attr_group starts checking at NHA_GROUP. The group type defaults to multipath and the NHA_GROUP_TYPE is currently optional so this has slipped through so far. Fix the attribute checking to handle support of new group types.

Fixes 430a049190de ("nexthop: Add support for nexthop groups")
---
 net/ipv4/nexthop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/nexthop.c +1 -1
index fdfca534d094..2a31c4af845e 100644
@@ -433,7 +433,7 @@ static int nh_check_attr_group(struct net *net, struct nlattr *tb[],
 		if (!valid_group_nh(nh, len, extack))
 			return -EINVAL;
 	}
-	for (i = NHA_GROUP + 1; i < __NHA_MAX; ++i) {
+	for (i = NHA_GROUP_TYPE + 1; i < __NHA_MAX; ++i) {
 		if (!tb[i])
 			continue;
 
Signature · 1 line
2.21.1 (Apple Git-122.3)
maintainer
#1 lore raw

From: David Ahern <[email protected]>
Date: Sun, 17 May 2020 11:26:32 -0600

Quoted 11 lines

From: David Ahern <[email protected]>

For nexthop groups, attributes after NHA_GROUP_TYPE are invalid, but nh_check_attr_group starts checking at NHA_GROUP. The group type defaults to multipath and the NHA_GROUP_TYPE is currently optional so this has slipped through so far. Fix the attribute checking to handle support of new group types.

Fixes 430a049190de ("nexthop: Add support for nexthop groups")

Applied and queued up for -stable, thanks David.