From: Ido Schimmel Date: Wed, 4 Nov 2020 13:30:30 +0000 (+0200) Subject: nexthop: Emit a notification when a nexthop group is replaced X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d144cc5f4f4eaf0cd2e7a1a6369054da583f6c93;p=linux.git nexthop: Emit a notification when a nexthop group is replaced Emit a notification in the nexthop notification chain when an existing nexthop group is replaced. The notification is emitted after all the validation checks were performed, but before the new configuration (i.e., 'struct nh_grp') is pointed at by the old shell (i.e., 'struct nexthop'). This prevents the need to perform rollback in case the notification is vetoed. Signed-off-by: Ido Schimmel Reviewed-by: David Ahern Signed-off-by: Jakub Kicinski --- diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 4e9d0395f959b..3f43693498ee8 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -1050,13 +1050,17 @@ static int replace_nexthop_grp(struct net *net, struct nexthop *old, struct netlink_ext_ack *extack) { struct nh_group *oldg, *newg; - int i; + int i, err; if (!new->is_group) { NL_SET_ERR_MSG(extack, "Can not replace a nexthop group with a nexthop."); return -EINVAL; } + err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new, extack); + if (err) + return err; + oldg = rtnl_dereference(old->nh_grp); newg = rtnl_dereference(new->nh_grp);