Skip to content

Commit

Permalink
net: switch sock_setbindtodevice to sockptr_t
Browse files Browse the repository at this point in the history
Pass a sockptr_t to prepare for set_fs-less handling of the kernel
pointer from bpf-cgroup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Christoph Hellwig authored and David S. Miller committed Jul 24, 2020
1 parent b1ea9ff commit 5790642
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/core/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,7 @@ int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk)
}
EXPORT_SYMBOL(sock_bindtoindex);

static int sock_setbindtodevice(struct sock *sk, char __user *optval,
int optlen)
static int sock_setbindtodevice(struct sock *sk, sockptr_t optval, int optlen)
{
int ret = -ENOPROTOOPT;
#ifdef CONFIG_NETDEVICES
Expand All @@ -632,7 +631,7 @@ static int sock_setbindtodevice(struct sock *sk, char __user *optval,
memset(devname, 0, sizeof(devname));

ret = -EFAULT;
if (copy_from_user(devname, optval, optlen))
if (copy_from_sockptr(devname, optval, optlen))
goto out;

index = 0;
Expand Down Expand Up @@ -840,7 +839,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
*/

if (optname == SO_BINDTODEVICE)
return sock_setbindtodevice(sk, optval, optlen);
return sock_setbindtodevice(sk, USER_SOCKPTR(optval), optlen);

if (optlen < sizeof(int))
return -EINVAL;
Expand Down

0 comments on commit 5790642

Please sign in to comment.