| From foo@baz Wed 27 May 2020 07:13:24 PM CEST |
| From: David Ahern <dsahern@gmail.com> |
| Date: Sun, 17 May 2020 11:26:32 -0600 |
| Subject: nexthop: Fix attribute checking for groups |
| |
| From: David Ahern <dsahern@gmail.com> |
| |
| [ Upstream commit 84be69b869a5a496a6cfde9b3c29509207a1f1fa ] |
| |
| 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") |
| Signed-off-by: ASSOGBA Emery <assogba.emery@gmail.com> |
| Signed-off-by: David Ahern <dsahern@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/nexthop.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv4/nexthop.c |
| +++ b/net/ipv4/nexthop.c |
| @@ -434,7 +434,7 @@ static int nh_check_attr_group(struct ne |
| 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; |
| |
