4 files changed, 225 insertions, 28 deletions

diff --git a/include/uapi/linux/mroute.h b/include/uapi/linux/mroute.h
index 1c11004af5db..a382d2c04a42 100644
--- a/include/uapi/linux/mroute.h
+++ b/include/uapi/linux/mroute.h
@@ -26,7 +26,9 @@
 #define MRT_ASSERT      (MRT_BASE+7)    /* Activate PIM assert mode             */
 #define MRT_PIM         (MRT_BASE+8)    /* enable PIM code                      */
 #define MRT_TABLE       (MRT_BASE+9)    /* Specify mroute table ID              */
-#define MRT_MAX         (MRT_BASE+9)
+#define MRT_ADD_MFC_PROXY       (MRT_BASE+10)   /* Add a (*,*|G) mfc entry      */
+#define MRT_DEL_MFC_PROXY       (MRT_BASE+11)   /* Del a (*,*|G) mfc entry      */
+#define MRT_MAX         (MRT_BASE+11)
 
 #define SIOCGETVIFCNT   SIOCPROTOPRIVATE        /* IP protocol privates */
 #define SIOCGETSGCNT    (SIOCPROTOPRIVATE+1)
diff --git a/include/uapi/linux/mroute6.h b/include/uapi/linux/mroute6.h
index c206ae3a2327..ce91215cf7e6 100644
--- a/include/uapi/linux/mroute6.h
+++ b/include/uapi/linux/mroute6.h
@@ -26,7 +26,9 @@
 #define MRT6_ASSERT     (MRT6_BASE+7)   /* Activate PIM assert mode             */
 #define MRT6_PIM        (MRT6_BASE+8)   /* enable PIM code                      */
 #define MRT6_TABLE      (MRT6_BASE+9)   /* Specify mroute table ID              */
-#define MRT6_MAX        (MRT6_BASE+9)
+#define MRT6_ADD_MFC_PROXY      (MRT6_BASE+10)  /* Add a (*,*|G) mfc entry      */
+#define MRT6_DEL_MFC_PROXY      (MRT6_BASE+11)  /* Del a (*,*|G) mfc entry      */
+#define MRT6_MAX        (MRT6_BASE+11)
 
 #define SIOCGETMIFCNT_IN6       SIOCPROTOPRIVATE        /* IP protocol privates */
 #define SIOCGETSGCNT_IN6        (SIOCPROTOPRIVATE+1)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index a9454cbd953c..4b5e22670d44 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -828,6 +828,49 @@ static struct mfc_cache *ipmr_cache_find(struct mr_table *mrt,
         return NULL;
 }
 
+/* Look for a (*,*,oif) entry */
+static struct mfc_cache *ipmr_cache_find_any_parent(struct mr_table *mrt,
+                                                    int vifi)
+{
+        int line = MFC_HASH(INADDR_ANY, INADDR_ANY);
+        struct mfc_cache *c;
+
+        list_for_each_entry_rcu(c, &mrt->mfc_cache_array[line], list)
+                if (c->mfc_origin == INADDR_ANY &&
+                    c->mfc_mcastgrp == INADDR_ANY &&
+                    c->mfc_un.res.ttls[vifi] < 255)
+                        return c;
+
+        return NULL;
+}
+
+/* Look for a (*,G) entry */
+static struct mfc_cache *ipmr_cache_find_any(struct mr_table *mrt,
+                                             __be32 mcastgrp, int vifi)
+{
+        int line = MFC_HASH(mcastgrp, INADDR_ANY);
+        struct mfc_cache *c, *proxy;
+
+        if (mcastgrp == INADDR_ANY)
+                goto skip;
+
+        list_for_each_entry_rcu(c, &mrt->mfc_cache_array[line], list)
+                if (c->mfc_origin == INADDR_ANY &&
+                    c->mfc_mcastgrp == mcastgrp) {
+                        if (c->mfc_un.res.ttls[vifi] < 255)
+                                return c;
+
+                        /* It's ok if the vifi is part of the static tree */
+                        proxy = ipmr_cache_find_any_parent(mrt,
+                                                           c->mfc_parent);
+                        if (proxy && proxy->mfc_un.res.ttls[vifi] < 255)
+                                return c;
+                }
+
+skip:
+        return ipmr_cache_find_any_parent(mrt, vifi);
+}
+
 /*
  *      Allocate a multicast cache entry
  */
@@ -1053,7 +1096,7 @@ ipmr_cache_unresolved(struct mr_table *mrt, vifi_t vifi, struct sk_buff *skb)
  *      MFC cache manipulation by user space mroute daemon
  */
 
-static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc)
+static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc, int parent)
 {
         int line;
         struct mfc_cache *c, *next;
@@ -1062,7 +1105,8 @@ static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc)
 
         list_for_each_entry_safe(c, next, &mrt->mfc_cache_array[line], list) {
                 if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
-                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr) {
+                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr &&
+                    (parent == -1 || parent == c->mfc_parent)) {
                         list_del_rcu(&c->list);
                         mroute_netlink_event(mrt, c, RTM_DELROUTE);
                         ipmr_cache_free(c);
@@ -1073,7 +1117,7 @@ static int ipmr_mfc_delete(struct mr_table *mrt, struct mfcctl *mfc)
 }
 
 static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
-                        struct mfcctl *mfc, int mrtsock)
+                        struct mfcctl *mfc, int mrtsock, int parent)
 {
         bool found = false;
         int line;
@@ -1086,7 +1130,8 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
 
         list_for_each_entry(c, &mrt->mfc_cache_array[line], list) {
                 if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
-                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr) {
+                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr &&
+                    (parent == -1 || parent == c->mfc_parent)) {
                         found = true;
                         break;
                 }
@@ -1103,7 +1148,8 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
                 return 0;
         }
 
-        if (!ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
+        if (mfc->mfcc_mcastgrp.s_addr != INADDR_ANY &&
+            !ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
                 return -EINVAL;
 
         c = ipmr_cache_alloc();
@@ -1218,7 +1264,7 @@ static void mrtsock_destruct(struct sock *sk)
 
 int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsigned int optlen)
 {
-        int ret;
+        int ret, parent = 0;
         struct vifctl vif;
         struct mfcctl mfc;
         struct net *net = sock_net(sk);
@@ -1287,16 +1333,22 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
                  */
         case MRT_ADD_MFC:
         case MRT_DEL_MFC:
+                parent = -1;
+        case MRT_ADD_MFC_PROXY:
+        case MRT_DEL_MFC_PROXY:
                 if (optlen != sizeof(mfc))
                         return -EINVAL;
                 if (copy_from_user(&mfc, optval, sizeof(mfc)))
                         return -EFAULT;
+                if (parent == 0)
+                        parent = mfc.mfcc_parent;
                 rtnl_lock();
-                if (optname == MRT_DEL_MFC)
-                        ret = ipmr_mfc_delete(mrt, &mfc);
+                if (optname == MRT_DEL_MFC || optname == MRT_DEL_MFC_PROXY)
+                        ret = ipmr_mfc_delete(mrt, &mfc, parent);
                 else
                         ret = ipmr_mfc_add(net, mrt, &mfc,
-                                           sk == rtnl_dereference(mrt->mroute_sk));
+                                           sk == rtnl_dereference(mrt->mroute_sk),
+                                           parent);
                 rtnl_unlock();
                 return ret;
                 /*
@@ -1749,17 +1801,28 @@ static int ip_mr_forward(struct net *net, struct mr_table *mrt,
 {
         int psend = -1;
         int vif, ct;
+        int true_vifi = ipmr_find_vif(mrt, skb->dev);
 
         vif = cache->mfc_parent;
         cache->mfc_un.res.pkt++;