4 files changed, 91 insertions, 12 deletions

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 34e70fb89d4a..47de17208d7a 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -192,6 +192,14 @@ extern int	   dccp_getsockopt(struct sock *sk, int level, int optname,
                                    char __user *optval, int __user *optlen);
 extern int         dccp_setsockopt(struct sock *sk, int level, int optname,
                                    char __user *optval, int optlen);
+#ifdef CONFIG_COMPAT
+extern int         compat_dccp_getsockopt(struct sock *sk,
+                                int level, int optname,
+                                char __user *optval, int __user *optlen);
+extern int         compat_dccp_setsockopt(struct sock *sk,
+                                int level, int optname,
+                                char __user *optval, int optlen);
+#endif
 extern int         dccp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int         dccp_sendmsg(struct kiocb *iocb, struct sock *sk,
                                 struct msghdr *msg, size_t size);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 80d450ba6219..8a33c8498d9c 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -994,6 +994,10 @@ static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = {
         .net_header_len = sizeof(struct iphdr),
         .setsockopt     = ip_setsockopt,
         .getsockopt     = ip_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_ip_setsockopt,
+        .compat_getsockopt      = compat_ip_getsockopt,
+#endif
         .addr2sockaddr  = inet_csk_addr2sockaddr,
         .sockaddr_len   = sizeof(struct sockaddr_in),
 };
@@ -1040,6 +1044,10 @@ static struct proto dccp_v4_prot = {
         .init                   = dccp_v4_init_sock,
         .setsockopt             = dccp_setsockopt,
         .getsockopt             = dccp_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_dccp_setsockopt,
+        .compat_getsockopt      = compat_dccp_getsockopt,
+#endif
         .sendmsg                = dccp_sendmsg,
         .recvmsg                = dccp_recvmsg,
         .backlog_rcv            = dccp_v4_do_rcv,
@@ -1079,6 +1087,10 @@ static const struct proto_ops inet_dccp_ops = {
         .shutdown       = inet_shutdown,
         .setsockopt     = sock_common_setsockopt,
         .getsockopt     = sock_common_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_sock_common_setsockopt,
+        .compat_getsockopt      = compat_sock_common_getsockopt,
+#endif
         .sendmsg        = inet_sendmsg,
         .recvmsg        = sock_common_recvmsg,
         .mmap           = sock_no_mmap,
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 7c8233f6d3c2..89106c7d3247 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1114,6 +1114,10 @@ static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = {
         .net_header_len = sizeof(struct ipv6hdr),
         .setsockopt     = ipv6_setsockopt,
         .getsockopt     = ipv6_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_ipv6_setsockopt,
+        .compat_getsockopt      = compat_ipv6_getsockopt,
+#endif
         .addr2sockaddr  = inet6_csk_addr2sockaddr,
         .sockaddr_len   = sizeof(struct sockaddr_in6)
 };
@@ -1130,6 +1134,10 @@ static struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
         .net_header_len = sizeof(struct iphdr),
         .setsockopt     = ipv6_setsockopt,
         .getsockopt     = ipv6_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_ipv6_setsockopt,
+        .compat_getsockopt      = compat_ipv6_getsockopt,
+#endif
         .addr2sockaddr  = inet6_csk_addr2sockaddr,
         .sockaddr_len   = sizeof(struct sockaddr_in6)
 };
@@ -1167,6 +1175,10 @@ static struct proto dccp_v6_prot = {
         .init           = dccp_v6_init_sock,
         .setsockopt     = dccp_setsockopt,
         .getsockopt     = dccp_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_dccp_setsockopt,
+        .compat_getsockopt      = compat_dccp_getsockopt,
+#endif
         .sendmsg        = dccp_sendmsg,
         .recvmsg        = dccp_recvmsg,
         .backlog_rcv    = dccp_v6_do_rcv,
@@ -1204,6 +1216,10 @@ static struct proto_ops inet6_dccp_ops = {
         .shutdown       = inet_shutdown,
         .setsockopt     = sock_common_setsockopt,
         .getsockopt     = sock_common_getsockopt,
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt      = compat_sock_common_setsockopt,
+        .compat_getsockopt      = compat_sock_common_getsockopt,
+#endif
         .sendmsg        = inet_sendmsg,
         .recvmsg        = sock_common_recvmsg,
         .mmap           = sock_no_mmap,
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index baccaf35ffbd..59b214995f28 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -455,18 +455,13 @@ out_free_val:
         goto out;
 }
 
-int dccp_setsockopt(struct sock *sk, int level, int optname,
-                    char __user *optval, int optlen)
+static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
+                char __user *optval, int optlen)
 {
         struct dccp_sock *dp;
         int err;
         int val;
 
-        if (level != SOL_DCCP)
-                return inet_csk(sk)->icsk_af_ops->setsockopt(sk, level,
-                                                             optname, optval,
-                                                             optlen);
-
         if (optlen < sizeof(int))
                 return -EINVAL;
 
@@ -512,8 +507,34 @@ int dccp_setsockopt(struct sock *sk, int level, int optname,
         return err;
 }
 
+int dccp_setsockopt(struct sock *sk, int level, int optname,
+                    char __user *optval, int optlen)
+{
+        if (level != SOL_DCCP)
+                return inet_csk(sk)->icsk_af_ops->setsockopt(sk, level,
+                                                             optname, optval,
+                                                             optlen);
+        return do_dccp_setsockopt(sk, level, optname, optval, optlen);
+}
 EXPORT_SYMBOL_GPL(dccp_setsockopt);
 
+#ifdef CONFIG_COMPAT
+int compat_dccp_setsockopt(struct sock *sk, int level, int optname,
+                    char __user *optval, int optlen)
+{
+        if (level != SOL_DCCP) {
+                if (inet_csk(sk)->icsk_af_ops->compat_setsockopt)
+                        return inet_csk(sk)->icsk_af_ops->compat_setsockopt(sk,
+                                level, optname, optval, optlen);
+                else
+                        return inet_csk(sk)->icsk_af_ops->setsockopt(sk,
+                                level, optname, optval, optlen);
+        }
+        return do_dccp_setsockopt(sk, level, optname, optval, optlen);
+}
+EXPORT_SYMBOL_GPL(compat_dccp_setsockopt);
+#endif
+
 static int dccp_getsockopt_service(struct sock *sk, int len,
                                    __be32 __user *optval,
                                    int __user *optlen)
@@ -545,16 +566,12 @@ out:
         return err;
 }
 
-int dccp_getsockopt(struct sock *sk, int level, int optname,
+static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
                     char __user *optval, int __user *optlen)
 {
         struct dccp_sock *dp;
         int val, len;
 
-        if (level != SOL_DCCP)
-                return inet_csk(sk)->icsk_af_ops->getsockopt(sk, level,
-                                                             optname, optval,
-                                                             optlen);
         if (get_user(len, optlen))
                 return -EFAULT;
 
@@ -587,8 +604,34 @@ int dccp_getsockopt(struct sock *sk, int level, int optname,
         return 0;
 }
 
+int dccp_getsockopt(struct sock *sk, int level, int optname,
+                    char __user *optval, int __user *optlen)
+{
+        if (level != SOL_DCCP)
+                return inet_csk(sk)->icsk_af_ops->getsockopt(sk, level,
+                                                             optname, optval,
+                                                             optlen);
+        return do_dccp_getsockopt(sk, level, optname, optval, optlen);
+}
 EXPORT_SYMBOL_GPL(dccp_getsockopt);
 
+#ifdef CONFIG_COMPAT
+int compat_dccp_getsockopt(struct sock *sk, int level, int optname,
+                    char __user *optval, int __user *optlen)
+{
+        if (level != SOL_DCCP) {
+                if (inet_csk(sk)->icsk_af_ops->compat_setsockopt)
+                        return inet_csk(sk)->icsk_af_ops->compat_getsockopt(sk,
+                                level, optname, optval, optlen);
+                else
+                        return inet_csk(sk)->icsk_af_ops->getsockopt(sk,
+                                level, optname, optval, optlen);
+        }
+        return do_dccp_getsockopt(sk, level, optname, optval, optlen);
+}
+EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);
+#endif
+
 int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                  size_t len)
 {