1 files changed, 6 insertions, 1 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index f300d1cbfa91..097a1243c16c 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -808,6 +808,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
         {
                 struct ip_mreqn mreq;
                 struct net_device *dev = NULL;
+                int midx;
 
                 if (sk->sk_type == SOCK_STREAM)
                         goto e_inval;
@@ -852,11 +853,15 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 err = -EADDRNOTAVAIL;
                 if (!dev)
                         break;
+
+                midx = l3mdev_master_ifindex(dev);
+
                 dev_put(dev);
 
                 err = -EINVAL;
                 if (sk->sk_bound_dev_if &&
-                    mreq.imr_ifindex != sk->sk_bound_dev_if)
+                    mreq.imr_ifindex != sk->sk_bound_dev_if &&
+                    (!midx || midx != sk->sk_bound_dev_if))
                         break;
 
                 inet->mc_index = mreq.imr_ifindex;