2 files changed, 10 insertions, 4 deletions

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index f64b01787ddc..034cda789a15 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -16,9 +16,10 @@ static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
 }
 
 enum netlink_skb_flags {
-        NETLINK_SKB_MMAPED      = 0x1,          /* Packet data is mmaped */
-        NETLINK_SKB_TX          = 0x2,          /* Packet was sent by userspace */
-        NETLINK_SKB_DELIVERED   = 0x4,          /* Packet was delivered */
+        NETLINK_SKB_MMAPED      = 0x1,  /* Packet data is mmaped */
+        NETLINK_SKB_TX          = 0x2,  /* Packet was sent by userspace */
+        NETLINK_SKB_DELIVERED   = 0x4,  /* Packet was delivered */
+        NETLINK_SKB_DST         = 0x8,  /* Dst set in sendto or sendmsg */
 };
 
 struct netlink_skb_parms {
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 81dca96d2be6..f22757a29cd0 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1373,7 +1373,9 @@ retry:
 bool __netlink_ns_capable(const struct netlink_skb_parms *nsp,
                         struct user_namespace *user_ns, int cap)
 {
-        return sk_ns_capable(nsp->sk, user_ns, cap);
+        return ((nsp->flags & NETLINK_SKB_DST) ||
+                file_ns_capable(nsp->sk->sk_socket->file, user_ns, cap)) &&
+                ns_capable(user_ns, cap);
 }
 EXPORT_SYMBOL(__netlink_ns_capable);
 
@@ -2293,6 +2295,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
         struct sk_buff *skb;
         int err;
         struct scm_cookie scm;
+        u32 netlink_skb_flags = 0;
 
         if (msg->msg_flags&MSG_OOB)
                 return -EOPNOTSUPP;
@@ -2314,6 +2317,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
                 if ((dst_group || dst_portid) &&
                     !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
                         goto out;
+                netlink_skb_flags |= NETLINK_SKB_DST;
         } else {
                 dst_portid = nlk->dst_portid;
                 dst_group = nlk->dst_group;
@@ -2343,6 +2347,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
         NETLINK_CB(skb).portid  = nlk->portid;
         NETLINK_CB(skb).dst_group = dst_group;
         NETLINK_CB(skb).creds   = siocb->scm->creds;
+        NETLINK_CB(skb).flags   = netlink_skb_flags;
 
         err = -EFAULT;
         if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {