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

ipv6: move SIOCADDRT and SIOCDELRT handling into ->compat_ioctl 



To prepare removing the global routing_ioctl hack start lifting the code
into a newly added ipv6 ->compat_ioctl handler.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c1552da

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,8 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len); 
int inet6_getname(struct socket *sock, struct sockaddr *uaddr,

		  int peer);

int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int inet6_compat_ioctl(struct socket *sock, unsigned int cmd,

		unsigned long arg);



int inet6_hash_connect(struct inet_timewait_death_row *death_row,

			      struct sock *sk);

net/dccp/ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ static const struct proto_ops inet6_dccp_ops = { 
	.mmap		   = sock_no_mmap,

	.sendpage	   = sock_no_sendpage,

#ifdef CONFIG_COMPAT

	.compat_ioctl	   = inet6_compat_ioctl,

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

net/ipv6/af_inet6.c

+53 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <net/calipso.h>

#include <net/seg6.h>

#include <net/rpl.h>

#include <net/compat.h>



#include <linux/uaccess.h>

#include <linux/mroute6.h>
@@ -571,6 +572,56 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
}

EXPORT_SYMBOL(inet6_ioctl);



#ifdef CONFIG_COMPAT

struct compat_in6_rtmsg {

	struct in6_addr		rtmsg_dst;

	struct in6_addr		rtmsg_src;

	struct in6_addr		rtmsg_gateway;

	u32			rtmsg_type;

	u16			rtmsg_dst_len;

	u16			rtmsg_src_len;

	u32			rtmsg_metric;

	u32			rtmsg_info;

	u32			rtmsg_flags;

	s32			rtmsg_ifindex;

};



static int inet6_compat_routing_ioctl(struct sock *sk, unsigned int cmd,

		struct compat_in6_rtmsg __user *ur)

{

	struct in6_rtmsg rt;



	if (copy_from_user(&rt.rtmsg_dst, &ur->rtmsg_dst,

			3 * sizeof(struct in6_addr)) ||

	    get_user(rt.rtmsg_type, &ur->rtmsg_type) ||

	    get_user(rt.rtmsg_dst_len, &ur->rtmsg_dst_len) ||

	    get_user(rt.rtmsg_src_len, &ur->rtmsg_src_len) ||

	    get_user(rt.rtmsg_metric, &ur->rtmsg_metric) ||

	    get_user(rt.rtmsg_info, &ur->rtmsg_info) ||

	    get_user(rt.rtmsg_flags, &ur->rtmsg_flags) ||

	    get_user(rt.rtmsg_ifindex, &ur->rtmsg_ifindex))

		return -EFAULT;





	return ipv6_route_ioctl(sock_net(sk), cmd, &rt);

}



int inet6_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	void __user *argp = compat_ptr(arg);

	struct sock *sk = sock->sk;



	switch (cmd) {

	case SIOCADDRT:

	case SIOCDELRT:

		return inet6_compat_routing_ioctl(sk, cmd, argp);

	default:

		return -ENOIOCTLCMD;

	}

}

EXPORT_SYMBOL_GPL(inet6_compat_ioctl);

#endif /* CONFIG_COMPAT */



INDIRECT_CALLABLE_DECLARE(int udpv6_sendmsg(struct sock *, struct msghdr *,

					    size_t));

int inet6_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
@@ -632,6 +683,7 @@ const struct proto_ops inet6_stream_ops = { 
	.read_sock	   = tcp_read_sock,

	.peek_len	   = tcp_peek_len,

#ifdef CONFIG_COMPAT

	.compat_ioctl	   = inet6_compat_ioctl,

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif
@@ -660,6 +712,7 @@ const struct proto_ops inet6_dgram_ops = { 
	.sendpage	   = sock_no_sendpage,

	.set_peek_off	   = sk_set_peek_off,

#ifdef CONFIG_COMPAT

	.compat_ioctl	   = inet6_compat_ioctl,

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

net/ipv6/raw.c

+1 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,7 @@ const struct proto_ops inet6_sockraw_ops = { 
	.mmap		   = sock_no_mmap,

	.sendpage	   = sock_no_sendpage,

#ifdef CONFIG_COMPAT

	.compat_ioctl	   = inet6_compat_ioctl,

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

net/l2tp/l2tp_ip6.c

+1 −0
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ static const struct proto_ops l2tp_ip6_ops = { 
	.mmap		   = sock_no_mmap,

	.sendpage	   = sock_no_sendpage,

#ifdef CONFIG_COMPAT

	.compat_ioctl	   = inet6_compat_ioctl,

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif