net: pass a sockptr_t into ->setsockopt

[linux-2.6-block.git] / net / vmw_vsock / af_vsock.c

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index df204c6761c453008488fe02c608e739af3dd25f..27bbcfad9c1738acf08528ef0874185afba02ee1 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1517,7 +1517,7 @@ static void vsock_update_buffer_size(struct vsock_sock *vsk,
 static int vsock_stream_setsockopt(struct socket *sock,
                                   int level,
                                   int optname,
-                                  char __user *optval,
+                                  sockptr_t optval,
                                   unsigned int optlen)
 {
        int err;
@@ -1535,7 +1535,7 @@ static int vsock_stream_setsockopt(struct socket *sock,
                        err = -EINVAL;                    \
                        goto exit;                        \
                }                                         \
-               if (copy_from_user(&_v, optval, sizeof(_v)) != 0) {     \
+               if (copy_from_sockptr(&_v, optval, sizeof(_v)) != 0) {  \
                        err = -EFAULT;                                  \
                        goto exit;                                      \
                }                                                       \