A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

BACKPORT: net: add sock_bindtoindex

Browse source 
Add a helper to directly set the SO_BINDTOIFINDEX sockopt from kernel
space without going through a fake uaccess.

Change-Id: I6cf5767101ed908276085f7f54c0b1dc1437b6a3
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-28 07:12:13 +02:00 • committed by basamaryan
commit c1aa7dc417
No known key found for this signature in database
GPG key ID: 210D5384FB2A5885
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/net/sock.h
View file

@ -2763,4 +2763,6 @@ static inline bool sk_dev_equal_l3scope(struct sock *sk, int dif)
return false;
}
int sock_bindtoindex(struct sock *sk, int ifindex);
#endif /* _SOCK_H */

21
net/core/sock.c
View file

@ -570,7 +570,7 @@ struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie)
}
EXPORT_SYMBOL(sk_dst_check);
static int sock_setbindtodevice_locked(struct sock *sk, int ifindex)
static int sock_bindtoindex_locked(struct sock *sk, int ifindex)
{
int ret = -ENOPROTOOPT;
#ifdef CONFIG_NETDEVICES
@ -598,6 +598,18 @@ out:
return ret;
}
int sock_bindtoindex(struct sock *sk, int ifindex)
{
int ret;
lock_sock(sk);
ret = sock_bindtoindex_locked(sk, ifindex);
release_sock(sk);
return ret;
}
EXPORT_SYMBOL(sock_bindtoindex);
static int sock_setbindtodevice(struct sock *sk, char __user *optval,
int optlen)
{
@ -638,10 +650,7 @@ static int sock_setbindtodevice(struct sock *sk, char __user *optval,
goto out;
}
lock_sock(sk);
ret = sock_setbindtodevice_locked(sk, index);
release_sock(sk);
return sock_bindtoindex(sk, index);
out:
#endif
@ -1172,7 +1181,7 @@ set_rcvbuf:
break;
case SO_BINDTOIFINDEX:
ret = sock_setbindtodevice_locked(sk, val);
ret = sock_bindtoindex_locked(sk, val);
break;
default:

4
net/ipv4/udp_tunnel.c
View file

@ -22,9 +22,7 @@ int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
goto error;
if (cfg->bind_ifindex) {
err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTOIFINDEX,
(void *)&cfg->bind_ifindex,
sizeof(cfg->bind_ifindex));
err = sock_bindtoindex(sock->sk, cfg->bind_ifindex);
if (err < 0)
goto error;
}

4
net/ipv6/ip6_udp_tunnel.c
View file

@ -33,9 +33,7 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
goto error;
}
if (cfg->bind_ifindex) {
err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTOIFINDEX,
(void *)&cfg->bind_ifindex,
sizeof(cfg->bind_ifindex));
err = sock_bindtoindex(sock->sk, cfg->bind_ifindex);
if (err < 0)
goto error;
}