From: Ido Schimmel <idosch@nvidia.com>
Date: Thu, 7 Jan 2021 14:48:22 +0000 (+0200)
Subject: nexthop: Unlink nexthop group entry in error path
X-Git-Tag: Ubuntu-5.13.0-19.19~4199^2~3^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b01e53eee6dce7a8a6736e06b99b68cd0cc7a27;p=mirror_ubuntu-jammy-kernel.git

nexthop: Unlink nexthop group entry in error path

In case of error, remove the nexthop group entry from the list to which
it was previously added.

Fixes: 430a049190de ("nexthop: Add support for nexthop groups")
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c
index f8035cfa9c20..712cdc061cde 100644
--- a/net/ipv4/nexthop.c
+++ b/net/ipv4/nexthop.c
@@ -1459,8 +1459,10 @@ static struct nexthop *nexthop_create_group(struct net *net,
 	return nh;
 
 out_no_nh:
-	for (i--; i >= 0; --i)
+	for (i--; i >= 0; --i) {
+		list_del(&nhg->nh_entries[i].nh_list);
 		nexthop_put(nhg->nh_entries[i].nh);
+	}
 
 	kfree(nhg->spare);
 	kfree(nhg);