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

net: remove compat_sock_common_{get,set}sockopt 



Add the compat handling to sock_common_{get,set}sockopt instead,
keyed of in_compat_syscall().  This allow to remove the now unused
->compat_{get,set}sockopt methods from struct proto_ops.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Acked-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d295e54

include/linux/net.h

+0 −6
Original line number Diff line number Diff line
@@ -165,12 +165,6 @@ struct proto_ops { 
				      int optname, char __user *optval, unsigned int optlen);

	int		(*getsockopt)(struct socket *sock, int level,

				      int optname, char __user *optval, int __user *optlen);

#ifdef CONFIG_COMPAT

	int		(*compat_setsockopt)(struct socket *sock, int level,

				      int optname, char __user *optval, unsigned int optlen);

	int		(*compat_getsockopt)(struct socket *sock, int level,

				      int optname, char __user *optval, int __user *optlen);

#endif

	void		(*show_fdinfo)(struct seq_file *m, struct socket *sock);

	int		(*sendmsg)   (struct socket *sock, struct msghdr *m,

				      size_t total_len);

include/net/sock.h

+0 −4
Original line number Diff line number Diff line
@@ -1744,10 +1744,6 @@ int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, 
			int flags);

int sock_common_setsockopt(struct socket *sock, int level, int optname,

				  char __user *optval, unsigned int optlen);

int compat_sock_common_getsockopt(struct socket *sock, int level,

		int optname, char __user *optval, int __user *optlen);

int compat_sock_common_setsockopt(struct socket *sock, int level,

		int optname, char __user *optval, unsigned int optlen);



void sk_common_release(struct sock *sk);

net/core/sock.c

+6 −24
Original line number Diff line number Diff line
@@ -3199,23 +3199,14 @@ int sock_common_getsockopt(struct socket *sock, int level, int optname, 
{

	struct sock *sk = sock->sk;



	return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(sock_common_getsockopt);



#ifdef CONFIG_COMPAT

int compat_sock_common_getsockopt(struct socket *sock, int level, int optname,

				  char __user *optval, int __user *optlen)

{

	struct sock *sk = sock->sk;



	if (sk->sk_prot->compat_getsockopt != NULL)

	if (in_compat_syscal() && sk->sk_prot->compat_getsockopt)

		return sk->sk_prot->compat_getsockopt(sk, level, optname,

						      optval, optlen);

#endif

	return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(compat_sock_common_getsockopt);

#endif

EXPORT_SYMBOL(sock_common_getsockopt);



int sock_common_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,

			int flags)
@@ -3240,23 +3231,14 @@ int sock_common_setsockopt(struct socket *sock, int level, int optname, 
{

	struct sock *sk = sock->sk;



	return sk->sk_prot->setsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(sock_common_setsockopt);



#ifdef CONFIG_COMPAT

int compat_sock_common_setsockopt(struct socket *sock, int level, int optname,

				  char __user *optval, unsigned int optlen)

{

	struct sock *sk = sock->sk;



	if (sk->sk_prot->compat_setsockopt != NULL)

	if (in_compat_syscall() && sk->sk_prot->compat_setsockopt)

		return sk->sk_prot->compat_setsockopt(sk, level, optname,

						      optval, optlen);

#endif

	return sk->sk_prot->setsockopt(sk, level, optname, optval, optlen);

}

EXPORT_SYMBOL(compat_sock_common_setsockopt);

#endif

EXPORT_SYMBOL(sock_common_setsockopt);



void sk_common_release(struct sock *sk)

{

net/dccp/ipv4.c

+0 −4
Original line number Diff line number Diff line
@@ -999,10 +999,6 @@ static const struct proto_ops inet_dccp_ops = { 
	.recvmsg	   = sock_common_recvmsg,

	.mmap		   = sock_no_mmap,

	.sendpage	   = sock_no_sendpage,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_sock_common_setsockopt,

	.compat_getsockopt = compat_sock_common_getsockopt,

#endif

};



static struct inet_protosw dccp_v4_protosw = {

net/dccp/ipv6.c

+0 −2
Original line number Diff line number Diff line
@@ -1083,8 +1083,6 @@ static const struct proto_ops inet6_dccp_ops = { 
	.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

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE