1 files changed, 29 insertions, 13 deletions

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index a2eb965207d3..2cbf380377d5 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1076,14 +1076,15 @@ int netlink_broadcast_filtered(struct sock *ssk, struct sk_buff *skb, u32 pid,
         sk_for_each_bound(sk, node, &nl_table[ssk->sk_protocol].mc_list)
                 do_one_broadcast(sk, &info);
 
-        kfree_skb(skb);
+        consume_skb(skb);
 
         netlink_unlock_table();
 
-        kfree_skb(info.skb2);
-
-        if (info.delivery_failure)
+        if (info.delivery_failure) {
+                kfree_skb(info.skb2);
                 return -ENOBUFS;
+        } else
+                consume_skb(info.skb2);
 
         if (info.delivered) {
                 if (info.congested && (allocation & __GFP_WAIT))
@@ -1323,19 +1324,23 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
         if (msg->msg_flags&MSG_OOB)
                 return -EOPNOTSUPP;
 
-        if (NULL == siocb->scm)
+        if (NULL == siocb->scm) {
                 siocb->scm = &scm;
+                memset(&scm, 0, sizeof(scm));
+        }
         err = scm_send(sock, msg, siocb->scm);
         if (err < 0)
                 return err;
 
         if (msg->msg_namelen) {
+                err = -EINVAL;
                 if (addr->nl_family != AF_NETLINK)
-                        return -EINVAL;
+                        goto out;
                 dst_pid = addr->nl_pid;
                 dst_group = ffs(addr->nl_groups);
+                err =  -EPERM;
                 if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND))
-                        return -EPERM;
+                        goto out;
         } else {
                 dst_pid = nlk->dst_pid;
                 dst_group = nlk->dst_group;
@@ -1387,6 +1392,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
         err = netlink_unicast(sk, skb, dst_pid, msg->msg_flags&MSG_DONTWAIT);
 
 out:
+        scm_destroy(siocb->scm);
         return err;
 }
 
@@ -1400,7 +1406,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
         struct netlink_sock *nlk = nlk_sk(sk);
         int noblock = flags&MSG_DONTWAIT;
         size_t copied;
-        struct sk_buff *skb, *frag __maybe_unused = NULL;
+        struct sk_buff *skb;
         int err;
 
         if (flags&MSG_OOB)
@@ -1435,7 +1441,21 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
                         kfree_skb(skb);
                         skb = compskb;
                 } else {
-                        frag = skb_shinfo(skb)->frag_list;
+                        /*
+                         * Before setting frag_list to NULL, we must get a
+                         * private copy of skb if shared (because of MSG_PEEK)
+                         */
+                        if (skb_shared(skb)) {
+                                struct sk_buff *nskb;
+
+                                nskb = pskb_copy(skb, GFP_KERNEL);
+                                kfree_skb(skb);
+                                skb = nskb;
+                                err = -ENOMEM;
+                                if (!skb)
+                                        goto out;
+                        }
+                        kfree_skb(skb_shinfo(skb)->frag_list);
                         skb_shinfo(skb)->frag_list = NULL;
                 }
         }
@@ -1472,10 +1492,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
         if (flags & MSG_TRUNC)
                 copied = skb->len;
 
-#ifdef CONFIG_COMPAT_NETLINK_MESSAGES
-        skb_shinfo(skb)->frag_list = frag;
-#endif
-
         skb_free_datagram(sk, skb);
 
         if (nlk->cb && atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf / 2)