3 files changed, 13 insertions, 1 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 5abee4c97449..d87362178588 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -375,6 +375,7 @@ lookup_protocol:
         inet->uc_ttl    = -1;
         inet->mc_loop   = 1;
         inet->mc_ttl    = 1;
+        inet->mc_all    = 1;
         inet->mc_index  = 0;
         inet->mc_list   = NULL;
 
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 9eb6219af615..e6058a503796 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2196,7 +2196,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
                         break;
         }
         if (!pmc)
-                return 1;
+                return inet->mc_all;
         psl = pmc->sflist;
         if (!psl)
                 return pmc->sfmode == MCAST_EXCLUDE;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 21b0187123d6..cb49936856e0 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -453,6 +453,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                              (1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) |
                              (1<<IP_PASSSEC) | (1<<IP_TRANSPARENT))) ||
             optname == IP_MULTICAST_TTL ||
+            optname == IP_MULTICAST_ALL ||
             optname == IP_MULTICAST_LOOP ||
             optname == IP_RECVORIGDSTADDR) {
                 if (optlen >= sizeof(int)) {
@@ -898,6 +899,13 @@ mc_msf_out:
                 kfree(gsf);
                 break;
         }
+        case IP_MULTICAST_ALL:
+                if (optlen < 1)
+                        goto e_inval;
+                if (val != 0 && val != 1)
+                        goto e_inval;
+                inet->mc_all = val;
+                break;
         case IP_ROUTER_ALERT:
                 err = ip_ra_control(sk, val ? 1 : 0, NULL);
                 break;
@@ -1151,6 +1159,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
                 release_sock(sk);
                 return err;
         }
+        case IP_MULTICAST_ALL:
+                val = inet->mc_all;
+                break;
         case IP_PKTOPTIONS:
         {
                 struct msghdr msg;