Merge tag 'gvt-next-2020-09-10' of https://github.com/intel/gvt-linux into drm-intel...

[linux-2.6-microblaze.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 6e53e43..7180979 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -984,7 +984,6 @@ out:
  *     llc_ui_getname - return the address info of a socket
  *     @sock: Socket to get address of.
  *     @uaddr: Address structure to return information.
- *     @uaddrlen: Length of address structure.
  *     @peer: Does user want local or remote address information.
  *
  *     Return the address information of a socket.
@@ -1054,7 +1053,7 @@ static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
  *     Set various connection specific parameters.
  */
 static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
-                            char __user *optval, unsigned int optlen)
+                            sockptr_t optval, unsigned int optlen)
 {
        struct sock *sk = sock->sk;
        struct llc_sock *llc = llc_sk(sk);
@@ -1064,7 +1063,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname,
        lock_sock(sk);
        if (unlikely(level != SOL_LLC || optlen != sizeof(int)))
                goto out;
-       rc = get_user(opt, (int __user *)optval);
+       rc = copy_from_sockptr(&opt, optval, sizeof(opt));
        if (rc)
                goto out;
        rc = -EINVAL;