Commit db45c0ef authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

ipv4: add ip_sock_set_recverr 



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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4e446bf

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -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_recverr(struct sock *sk);

void ip_sock_set_tos(struct sock *sk, int val);



#endif	/* _IP_H */

net/ipv4/ip_sockglue.c

+8 −0
Original line number Diff line number Diff line
@@ -589,6 +589,14 @@ void ip_sock_set_freebind(struct sock *sk) 
}

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

 *	TCP,UDP etc options on an IP socket.

net/rxrpc/local_object.c

+1 −7
Original line number Diff line number Diff line
@@ -171,13 +171,7 @@ static int rxrpc_open_socket(struct rxrpc_local *local, struct net *net) 
		/* Fall through */

	case AF_INET:

		/* we want to receive ICMP errors */

		opt = 1;

		ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,

					(char *) &opt, sizeof(opt));

		if (ret < 0) {

			_debug("setsockopt failed");

			goto error;

		}

		ip_sock_set_recverr(local->socket->sk);



		/* we want to set the don't fragment bit */

		opt = IP_PMTUDISC_DO;