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 f8035cfa9c2066d28c982fe243e1c8335a7a3186..712cdc061cde930018fa38aa7a9beb7e5b984798 100644 (file)
--- 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);