2.6.25-git12

 net

diff --git a/net/compat.c b/net/compat.c
index 80013fb..01bf95d 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -24,6 +24,8 @@
 
 #include <net/scm.h>
 #include <net/sock.h>
+#include <net/ip.h>
+#include <net/ipv6.h>
 #include <asm/uaccess.h>
 #include <net/compat.h>
 
@@ -521,6 +523,121 @@ asmlinkage long compat_sys_getsockopt(int fd, int level, int optname,
    }
    return err;
 }
+
+struct compat_group_req {
+   __u32             gr_interface;
+   struct __kernel_sockaddr_storage gr_group
+      __attribute__ ((aligned(4)));
+} __attribute__ ((packed));
+
+struct compat_group_source_req {
+   __u32             gsr_interface;
+   struct __kernel_sockaddr_storage gsr_group
+      __attribute__ ((aligned(4)));
+   struct __kernel_sockaddr_storage gsr_source
+      __attribute__ ((aligned(4)));
+} __attribute__ ((packed));
+
+struct compat_group_filter {
+   __u32             gf_interface;
+   struct __kernel_sockaddr_storage gf_group
+      __attribute__ ((aligned(4)));
+   __u32             gf_fmode;
+   __u32             gf_numsrc;
+   struct __kernel_sockaddr_storage gf_slist[1]
+      __attribute__ ((aligned(4)));
+} __attribute__ ((packed));
+
+
+int compat_mc_setsockopt(struct sock *sock, int level, int optname,
+   char __user *optval, int optlen,
+   int (*setsockopt)(struct sock *,int,int,char __user *,int))
+{
+   char __user   *koptval = optval;
+   int      koptlen = optlen;
+
+   switch (optname) {
+   case MCAST_JOIN_GROUP:
+   case MCAST_LEAVE_GROUP:
+   {
+      struct compat_group_req __user *gr32 = (void *)optval;
+      struct group_req __user *kgr =
+         compat_alloc_user_space(sizeof(struct group_req));
+      u32 interface;
+
+      if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) ||
+          !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) ||
+          __get_user(interface, &gr32->gr_interface) ||
+          __put_user(interface, &kgr->gr_interface) ||
+          copy_in_user(&kgr->gr_group, &gr32->gr_group,
+            sizeof(kgr->gr_group)))
+         return -EFAULT;
+      koptval = (char __user *)kgr;
+      koptlen = sizeof(struct group_req);
+      break;
+   }
+   case MCAST_JOIN_SOURCE_GROUP:
+   case MCAST_LEAVE_SOURCE_GROUP:
+   case MCAST_BLOCK_SOURCE:
+   case MCAST_UNBLOCK_SOURCE:
+   {
+      struct compat_group_source_req __user *gsr32 = (void *)optval;
+      struct group_source_req *kgsr = compat_alloc_user_space(
+         sizeof(struct group_source_req));
+      u32 interface;
+
+      if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) ||
+          !access_ok(VERIFY_WRITE, kgsr,
+         sizeof(struct group_source_req)) ||
+          __get_user(interface, &gsr32->gsr_interface) ||
+          __put_user(interface, &kgsr->gsr_interface) ||
+          copy_in_user(&kgsr->gsr_group, &gsr32->gsr_group,
+            sizeof(kgsr->gsr_group)) ||
+          copy_in_user(&kgsr->gsr_source, &gsr32->gsr_source,
+            sizeof(kgsr->gsr_source)))
+         return -EFAULT;
+      koptval = (char __user *)kgsr;
+      koptlen = sizeof(struct group_source_req);
+      break;
+   }
+   case MCAST_MSFILTER:
+   {
+      struct compat_group_filter __user *gf32 = (void *)optval;
+      struct group_filter *kgf;
+      u32 interface, fmode, numsrc;
+
+      if (!access_ok(VERIFY_READ, gf32, sizeof(*gf32)) ||
+          __get_user(interface, &gf32->gf_interface) ||
+          __get_user(fmode, &gf32->gf_fmode) ||
+          __get_user(numsrc, &gf32->gf_numsrc))
+         return -EFAULT;
+      koptlen = optlen + sizeof(struct group_filter) -
+            sizeof(struct compat_group_filter);
+      if (koptlen < GROUP_FILTER_SIZE(numsrc))
+         return -EINVAL;
+      kgf = compat_alloc_user_space(koptlen);
+      if (!access_ok(VERIFY_WRITE, kgf, koptlen) ||
+          __put_user(interface, &kgf->gf_interface) ||
+          __put_user(fmode, &kgf->gf_fmode) ||
+          __put_user(numsrc, &kgf->gf_numsrc) ||
+          copy_in_user(&kgf->gf_group, &gf32->gf_group,
+            sizeof(kgf->gf_group)) ||
+          (numsrc && copy_in_user(&kgf->gf_slist, &gf32->gf_slist,
+            numsrc * sizeof(kgf->gf_slist[0]))))
+         return -EFAULT;
+      koptval = (char __user *)kgf;
+      break;
+   }
+
+   default:
+      break;
+   }
+   return setsockopt(sock, level, optname, koptval, koptlen);
+}
+
+EXPORT_SYMBOL(compat_mc_setsockopt);
+
+
 /* Argument list sizes for compat_sys_socketcall */
 #define AL(x) ((x) * sizeof(u32))
 static unsigned char nas[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),