2 files changed, 8 insertions, 0 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 4d544573f48a..6b420aedcdcf 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -625,6 +625,10 @@ static int do_ip_setsockopt(struct sock *sk, int level,
         {
                 struct ip_mreqn mreq;
 
+                err = -EPROTO;
+                if (inet_sk(sk)->is_icsk)
+                        break;
+
                 if (optlen < sizeof(struct ip_mreq))
                         goto e_inval;
                 err = -EFAULT;
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 761a910f4f97..6b038aa72e88 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -554,6 +554,10 @@ done:
         {
                 struct ipv6_mreq mreq;
 
+                retv = -EPROTO;
+                if (inet_sk(sk)->is_icsk)
+                        break;
+
                 retv = -EFAULT;
                 if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq)))
                         break;