net: ipv4: add second dif to multicast source filter

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 97caf1821de8ceebe6016b134ae291d802fcb78d..f8231854b5d60316310fc5d8e57eea8625fe3078 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -118,7 +118,8 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
                struct ip_msfilter __user *optval, int __user *optlen);
 extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
                struct group_filter __user *optval, int __user *optlen);
-extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif);
+extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt,
+                         int dif, int sdif);
 extern void ip_mc_init_dev(struct in_device *);
 extern void ip_mc_destroy_dev(struct in_device *);
 extern void ip_mc_up(struct in_device *);

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 28f14afd0dd3a392da3b84c5e791fffaf46ad254..5bc8570c2ec35cd04fff8b691c6f5c2a25ff4669 100644 (file)
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2549,7 +2549,8 @@ done:
 /*
  * check if a multicast source filter allows delivery for a given <src,dst,intf>
  */
-int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
+int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr,
+                  int dif, int sdif)
 {
        struct inet_sock *inet = inet_sk(sk);
        struct ip_mc_socklist *pmc;
@@ -2564,7 +2565,8 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
        rcu_read_lock();
        for_each_pmc_rcu(inet, pmc) {
                if (pmc->multi.imr_multiaddr.s_addr == loc_addr &&
-                   pmc->multi.imr_ifindex == dif)
+                   (pmc->multi.imr_ifindex == dif ||
+                    (sdif && pmc->multi.imr_ifindex == sdif)))
                        break;
        }
        ret = inet->mc_all;

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 2726aecf224b3f6b1aa8b53cc316cb0448154a85..33b70bfd1122f08f4897ea6a68eb51e3a74bb1e5 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -193,7 +193,7 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)
                delivered = 1;
                if ((iph->protocol != IPPROTO_ICMP || !icmp_filter(sk, skb)) &&
                    ip_mc_sf_allow(sk, iph->daddr, iph->saddr,
-                                  skb->dev->ifindex)) {
+                                  skb->dev->ifindex, sdif)) {
                        struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC);
 
                        /* Not releasing hash table! */

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 99f25bfec606e045eaeaad5776629dbffeda3baf..cac59d7420cd84bf3a454c22e1061aee01e98267 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -606,7 +606,7 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
            (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif &&
             sk->sk_bound_dev_if != sdif))
                return false;
-       if (!ip_mc_sf_allow(sk, loc_addr, rmt_addr, dif))
+       if (!ip_mc_sf_allow(sk, loc_addr, rmt_addr, dif, sdif))
                return false;
        return true;
 }