1 files changed, 14 insertions, 11 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 2a3be0f1c516..4af741ef8d6b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3506,20 +3506,23 @@ static void inet6_prefix_notify(int event, struct inet6_dev *idev,
                          struct prefix_info *pinfo)
 {
         struct sk_buff *skb;
-        int size = NLMSG_SPACE(sizeof(struct prefixmsg) + INET6_PREFIX_RTA_SPACE);
+        int payload = sizeof(struct prefixmsg) + INET6_PREFIX_RTA_SPACE;
+        int err = -ENOBUFS;
 
-        skb = alloc_skb(size, GFP_ATOMIC);
-        if (!skb) {
-                netlink_set_err(rtnl, 0, RTNLGRP_IPV6_PREFIX, ENOBUFS);
-                return;
-        }
-        if (inet6_fill_prefix(skb, idev, pinfo, current->pid, 0, event, 0) < 0) {
+        skb = nlmsg_new(nlmsg_total_size(payload), GFP_ATOMIC);
+        if (skb == NULL)
+                goto errout;
+
+        err = inet6_fill_prefix(skb, idev, pinfo, 0, 0, event, 0);
+        if (err < 0) {
                 kfree_skb(skb);
-                netlink_set_err(rtnl, 0, RTNLGRP_IPV6_PREFIX, EINVAL);
-                return;
+                goto errout;
         }
-        NETLINK_CB(skb).dst_group = RTNLGRP_IPV6_PREFIX;
-        netlink_broadcast(rtnl, skb, 0, RTNLGRP_IPV6_PREFIX, GFP_ATOMIC);
+
+        err = rtnl_notify(skb, 0, RTNLGRP_IPV6_PREFIX, NULL, GFP_ATOMIC);
+errout:
+        if (err < 0)
+                rtnl_set_sk_err(RTNLGRP_IPV6_PREFIX, err);
 }
 
 static struct rtnetlink_link inet6_rtnetlink_table[RTM_NR_MSGTYPES] = {