UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: add ip6_sock_set_recverr 

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-28 07:12:32 +02:00 committed by David S. Miller
parent 9b115749ac
commit fce934949c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/ipv6.h
View File

@ -1188,4 +1188,11 @@ static inline int ip6_sock_set_v6only(struct sock *sk)
return 0; return 0;
} }
static inline void ip6_sock_set_recverr(struct sock *sk)
{
lock_sock(sk);
inet6_sk(sk)->recverr = true;
release_sock(sk);
}
#endif /* _NET_IPV6_H */ #endif /* _NET_IPV6_H */

10
net/rxrpc/local_object.c
View File

@ -107,7 +107,7 @@ static struct rxrpc_local *rxrpc_alloc_local(struct rxrpc_net *rxnet,
static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net) static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
{ {
struct sock *usk; struct sock *usk;
int ret, opt; int ret;
_enter("%p{%d,%d}", _enter("%p{%d,%d}",
local, local->srx.transport_type, local->srx.transport.family); local, local->srx.transport_type, local->srx.transport.family);
@ -157,13 +157,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
switch (local->srx.transport.family) { switch (local->srx.transport.family) {
case AF_INET6: case AF_INET6:
/* we want to receive ICMPv6 errors */ /* we want to receive ICMPv6 errors */
opt = 1; ip6_sock_set_recverr(local->socket->sk);
ret = kernel_setsockopt(local->socket, SOL_IPV6, IPV6_RECVERR,
(char *) &opt, sizeof(opt));
if (ret < 0) {
_debug("setsockopt failed");
goto error;
}
/* Fall through and set IPv4 options too otherwise we don't get /* Fall through and set IPv4 options too otherwise we don't get
* errors from IPv4 packets sent through the IPv6 socket. * errors from IPv4 packets sent through the IPv6 socket.