Merge tag 'please-pull-getrandom' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 2c65160565e1a084b5ff13832cfdb80d50ba7d6c..739db3100c2375ebd5113c4224b20423a585cc12 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -58,6 +58,7 @@
 #include <linux/in_route.h>
 #include <linux/route.h>
 #include <linux/skbuff.h>
+#include <linux/igmp.h>
 #include <net/net_namespace.h>
 #include <net/dst.h>
 #include <net/sock.h>
@@ -174,7 +175,9 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)
 
        while (sk) {
                delivered = 1;
-               if (iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) {
+               if ((iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) &&
+                   ip_mc_sf_allow(sk, iph->daddr, iph->saddr,
+                                  skb->dev->ifindex)) {
                        struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC);
 
                        /* Not releasing hash table! */
@@ -365,6 +368,8 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
 
        skb->ip_summed = CHECKSUM_NONE;
 
+       sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
+
        skb->transport_header = skb->network_header;
        err = -EFAULT;
        if (memcpy_fromiovecend((void *)iph, from, 0, length))
@@ -606,6 +611,8 @@ back_from_confirm:
                                      &rt, msg->msg_flags);
 
         else {
+               sock_tx_timestamp(sk, &ipc.tx_flags);
+
                if (!ipc.addr)
                        ipc.addr = fl4.daddr;
                lock_sock(sk);