3 files changed, 37 insertions, 4 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 55138f0d2b9d..cc6f8d0c625a 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -927,6 +927,7 @@ static const struct ipv6_stub ipv6_stub_impl = {
         .fib6_nh_init      = fib6_nh_init,
         .fib6_nh_release   = fib6_nh_release,
         .fib6_update_sernum = fib6_update_sernum_stub,
+        .fib6_rt_update    = fib6_rt_update,
         .ip6_del_rt        = ip6_del_rt,
         .udpv6_encap_enable = udpv6_encap_enable,
         .ndisc_send_na = ndisc_send_na,
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index df726fb8f70f..7958cf91895a 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -393,10 +393,10 @@ static int call_fib6_entry_notifier(struct notifier_block *nb, struct net *net,
         return call_fib6_notifier(nb, net, event_type, &info.info);
 }
 
-static int call_fib6_entry_notifiers(struct net *net,
-                                     enum fib_event_type event_type,
-                                     struct fib6_info *rt,
-                                     struct netlink_ext_ack *extack)
+int call_fib6_entry_notifiers(struct net *net,
+                              enum fib_event_type event_type,
+                              struct fib6_info *rt,
+                              struct netlink_ext_ack *extack)
 {
         struct fib6_entry_notifier_info info = {
                 .info.extack = extack,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7a014ca877ed..c52a7f49d096 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -5123,6 +5123,38 @@ errout:
                 rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);
 }
 
+void fib6_rt_update(struct net *net, struct fib6_info *rt,
+                    struct nl_info *info)
+{
+        u32 seq = info->nlh ? info->nlh->nlmsg_seq : 0;
+        struct sk_buff *skb;
+        int err = -ENOBUFS;
+
+        /* call_fib6_entry_notifiers will be removed when in-kernel notifier
+         * is implemented and supported for nexthop objects
+         */
+        call_fib6_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, rt, NULL);
+
+        skb = nlmsg_new(rt6_nlmsg_size(rt), gfp_any());
+        if (!skb)
+                goto errout;
+
+        err = rt6_fill_node(net, skb, rt, NULL, NULL, NULL, 0,
+                            RTM_NEWROUTE, info->portid, seq, NLM_F_REPLACE);
+        if (err < 0) {
+                /* -EMSGSIZE implies BUG in rt6_nlmsg_size() */
+                WARN_ON(err == -EMSGSIZE);
+                kfree_skb(skb);
+                goto errout;
+        }
+        rtnl_notify(skb, net, info->portid, RTNLGRP_IPV6_ROUTE,
+                    info->nlh, gfp_any());
+        return;
+errout:
+        if (err < 0)
+                rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);
+}
+
 static int ip6_route_dev_notify(struct notifier_block *this,
                                 unsigned long event, void *ptr)
 {