leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv4: add ip_sock_set_recverr

Browse Source 
Add a helper to directly set the IP_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:28 +02:00
committed by David S. Miller
parent c4e446bf5a
commit db45c0ef25
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/ip.h
View File

@@ -766,6 +766,7 @@ static inline bool inetdev_valid_mtu(unsigned int mtu)
} }
void ip_sock_set_freebind(struct sock *sk); void ip_sock_set_freebind(struct sock *sk);
void ip_sock_set_recverr(struct sock *sk);
void ip_sock_set_tos(struct sock *sk, int val); void ip_sock_set_tos(struct sock *sk, int val);
#endif /* _IP_H */ #endif /* _IP_H */

8
net/ipv4/ip_sockglue.c
View File

@@ -589,6 +589,14 @@ void ip_sock_set_freebind(struct sock *sk)
} }
EXPORT_SYMBOL(ip_sock_set_freebind); EXPORT_SYMBOL(ip_sock_set_freebind);
void ip_sock_set_recverr(struct sock *sk)
{
lock_sock(sk);
inet_sk(sk)->recverr = true;
release_sock(sk);
}
EXPORT_SYMBOL(ip_sock_set_recverr);
/* /*
* Socket option code for IP. This is the end of the line after any * Socket option code for IP. This is the end of the line after any
* TCP,UDP etc options on an IP socket. * TCP,UDP etc options on an IP socket.

8
net/rxrpc/local_object.c
View File

@@ -171,13 +171,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net)
/* Fall through */ /* Fall through */
case AF_INET: case AF_INET:
/* we want to receive ICMP errors */ /* we want to receive ICMP errors */
opt = 1; ip_sock_set_recverr(local->socket->sk);
ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,
(char *) &opt, sizeof(opt));
if (ret < 0) {
_debug("setsockopt failed");
goto error;
}
/* we want to set the don't fragment bit */ /* we want to set the don't fragment bit */
opt = IP_PMTUDISC_DO; opt = IP_PMTUDISC_DO;