1 files changed, 58 insertions, 25 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 00840474a449..3f93292b0ad8 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1207,16 +1207,13 @@ static int udp_destroy_sock(struct sock *sk)
 /*
  *      Socket option code for UDP
  */
-static int udp_setsockopt(struct sock *sk, int level, int optname, 
+static int do_udp_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 ip_setsockopt(sk, level, optname, optval, optlen);
-
         if(optlen<sizeof(int))
                 return -EINVAL;
 
@@ -1256,15 +1253,30 @@ static int udp_setsockopt(struct sock *sk, int level, int optname,
         return err;
 }
 
-static int udp_getsockopt(struct sock *sk, int level, int optname, 
+static int udp_setsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int optlen)
+{
+        if (level != SOL_UDP)
+                return ip_setsockopt(sk, level, optname, optval, optlen);
+        return do_udp_setsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_udp_setsockopt(struct sock *sk, int level, int optname,
+                                 char __user *optval, int optlen)
+{
+        if (level != SOL_UDP)
+                return compat_ip_setsockopt(sk, level, optname, optval, optlen);
+        return do_udp_setsockopt(sk, level, optname, optval, optlen);
+}
+#endif
+
+static int do_udp_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 ip_getsockopt(sk, level, optname, optval, optlen);
-
         if(get_user(len,optlen))
                 return -EFAULT;
 
@@ -1293,6 +1305,23 @@ static int udp_getsockopt(struct sock *sk, int level, int optname,
         return 0;
 }
 
+static int udp_getsockopt(struct sock *sk, int level, int optname,
+                          char __user *optval, int __user *optlen)
+{
+        if (level != SOL_UDP)
+                return ip_getsockopt(sk, level, optname, optval, optlen);
+        return do_udp_getsockopt(sk, level, optname, optval, optlen);
+}
+
+#ifdef CONFIG_COMPAT
+static int compat_udp_getsockopt(struct sock *sk, int level, int optname,
+                                 char __user *optval, int __user *optlen)
+{
+        if (level != SOL_UDP)
+                return compat_ip_getsockopt(sk, level, optname, optval, optlen);
+        return do_udp_getsockopt(sk, level, optname, optval, optlen);
+}
+#endif
 /**
  *      udp_poll - wait for a UDP event.
  *      @file - file struct
@@ -1341,23 +1370,27 @@ unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait)
 }
 
 struct proto udp_prot = {
-        .name =         "UDP",
-        .owner =        THIS_MODULE,
-        .close =        udp_close,
-        .connect =      ip4_datagram_connect,
-        .disconnect =   udp_disconnect,
-        .ioctl =        udp_ioctl,
-        .destroy =      udp_destroy_sock,
-        .setsockopt =   udp_setsockopt,
-        .getsockopt =   udp_getsockopt,
-        .sendmsg =      udp_sendmsg,
-        .recvmsg =      udp_recvmsg,
-        .sendpage =     udp_sendpage,
-        .backlog_rcv =  udp_queue_rcv_skb,
-        .hash =         udp_v4_hash,
-        .unhash =       udp_v4_unhash,
-        .get_port =     udp_v4_get_port,
-        .obj_size =     sizeof(struct udp_sock),
+        .name              = "UDP",
+        .owner             = THIS_MODULE,
+        .close             = udp_close,
+        .connect           = ip4_datagram_connect,
+        .disconnect        = udp_disconnect,
+        .ioctl             = udp_ioctl,
+        .destroy           = udp_destroy_sock,
+        .setsockopt        = udp_setsockopt,
+        .getsockopt        = udp_getsockopt,
+        .sendmsg           = udp_sendmsg,
+        .recvmsg           = udp_recvmsg,
+        .sendpage          = udp_sendpage,
+        .backlog_rcv       = udp_queue_rcv_skb,
+        .hash              = udp_v4_hash,
+        .unhash            = udp_v4_unhash,
+        .get_port          = udp_v4_get_port,
+        .obj_size          = sizeof(struct udp_sock),
+#ifdef CONFIG_COMPAT
+        .compat_setsockopt = compat_udp_setsockopt,
+        .compat_getsockopt = compat_udp_getsockopt,
+#endif
 };
 
 /* ------------------------------------------------------------------------ */