1 files changed, 60 insertions, 24 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index c47648892c04..8d3432a70f3a 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -880,16 +880,13 @@ static int udpv6_destroy_sock(struct sock *sk)
 /*
  *      Socket option code for UDP
  */
-static int udpv6_setsockopt(struct sock *sk, int level, int optname, 
+static int do_udpv6_setsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, int optlen)
 {
         struct udp_sock *up = udp_sk(sk);
         int val;
         int err = 0;
 
-        if (level != SOL_UDP)
-                return ipv6_setsockopt(sk, level, optname, optval, optlen);
-
         if(optlen<sizeof(int))
                 return -EINVAL;
 
@@ -927,15 +924,31 @@ static int udpv6_setsockopt(struct sock *sk, int level, int optname,
         return err;
 }
 
-static int udpv6_getsockopt(struct sock *sk, int level, int optname, 
+static int udpv6_setsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int optlen)
+{
+        if (level != SOL_UDP)
+                return ipv6_setsockopt(sk, level, optname, optval, optlen);
+        return do_udpv6_setsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_udpv6_setsockopt(struct sock *sk, int level, int optname,
+                                   char __user *optval, int optlen)
+{
+        if (level != SOL_UDP)
+                return compat_ipv6_setsockopt(sk, level, optname,
+                                              optval, optlen);
+        return do_udpv6_setsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
+static int do_udpv6_getsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, int __user *optlen)
 {
         struct udp_sock *up = udp_sk(sk);
         int val, len;
 
-        if (level != SOL_UDP)
-                return ipv6_getsockopt(sk, level, optname, optval, optlen);
-
         if(get_user(len,optlen))
                 return -EFAULT;
 
@@ -964,6 +977,25 @@ static int udpv6_getsockopt(struct sock *sk, int level, int optname,
         return 0;
 }
 
+static int udpv6_getsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int __user *optlen)
+{
+        if (level != SOL_UDP)
+                return ipv6_getsockopt(sk, level, optname, optval, optlen);
+        return do_udpv6_getsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
+                                   char __user *optval, int __user *optlen)
+{
+        if (level != SOL_UDP)
+                return compat_ipv6_getsockopt(sk, level, optname,
+                                              optval, optlen);
+        return do_udpv6_getsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
 static struct inet6_protocol udpv6_protocol = {
         .handler        =       udpv6_rcv,
         .err_handler    =       udpv6_err,
@@ -1037,22 +1069,26 @@ void udp6_proc_exit(void) {
 /* ------------------------------------------------------------------------ */
 
 struct proto udpv6_prot = {
-        .name =         "UDPv6",
-        .owner =        THIS_MODULE,
-        .close =        udpv6_close,
-        .connect =      ip6_datagram_connect,
-        .disconnect =   udp_disconnect,
-        .ioctl =        udp_ioctl,
-        .destroy =      udpv6_destroy_sock,
-        .setsockopt =   udpv6_setsockopt,
-        .getsockopt =   udpv6_getsockopt,
-        .sendmsg =      udpv6_sendmsg,
-        .recvmsg =      udpv6_recvmsg,
-        .backlog_rcv =  udpv6_queue_rcv_skb,
-        .hash =         udp_v6_hash,
-        .unhash =       udp_v6_unhash,
-        .get_port =     udp_v6_get_port,
-        .obj_size =     sizeof(struct udp6_sock),
+        .name              = "UDPv6",
+        .owner             = THIS_MODULE,
+        .close             = udpv6_close,
+        .connect           = ip6_datagram_connect,
+        .disconnect        = udp_disconnect,
+        .ioctl             = udp_ioctl,
+        .destroy           = udpv6_destroy_sock,
+        .setsockopt        = udpv6_setsockopt,
+        .getsockopt        = udpv6_getsockopt,
+        .sendmsg           = udpv6_sendmsg,
+        .recvmsg           = udpv6_recvmsg,
+        .backlog_rcv       = udpv6_queue_rcv_skb,
+        .hash              = udp_v6_hash,
+        .unhash            = udp_v6_unhash,
+        .get_port          = udp_v6_get_port,
+        .obj_size          = sizeof(struct udp6_sock),
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt = compat_udpv6_setsockopt,
+        .compat_getsockopt = compat_udpv6_getsockopt,
+#endif
 };
 
 static struct inet_protosw udpv6_protosw = {