This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index ca7e1e5..46f36a5 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -844,7 +844,7 @@ static void mrtsock_destruct(struct sock *sk)
  *     MOSPF/PIM router set up we can clean this up.
  */
  
-int ip_mroute_setsockopt(struct sock *sk,int optname,char *optval,int optlen)
+int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int optlen)
 {
        int ret;
        struct vifctl vif;
@@ -925,7 +925,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char *optval,int optlen)
                case MRT_ASSERT:
                {
                        int v;
-                       if(get_user(v,(int *)optval))
+                       if(get_user(v,(int __user *)optval))
                                return -EFAULT;
                        mroute_do_assert=(v)?1:0;
                        return 0;
@@ -934,7 +934,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char *optval,int optlen)
                case MRT_PIM:
                {
                        int v, ret;
-                       if(get_user(v,(int *)optval))
+                       if(get_user(v,(int __user *)optval))
                                return -EFAULT;
                        v = (v)?1:0;
                        rtnl_lock();
@@ -970,7 +970,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char *optval,int optlen)
  *     Getsock opt support for the multicast routing system.
  */
  
-int ip_mroute_getsockopt(struct sock *sk,int optname,char *optval,int *optlen)
+int ip_mroute_getsockopt(struct sock *sk,int optname,char __user *optval,int __user *optlen)
 {
        int olr;
        int val;