Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fdadf7d authored by Dmitry Mishin's avatar Dmitry Mishin Committed by David S. Miller
Browse files

[NET]: {get|set}sockopt compatibility layer 



This patch extends {get|set}sockopt compatibility layer in order to
move protocol specific parts to their place and avoid huge universal
net/compat.c file in the future.

Signed-off-by: default avatarDmitry Mishin <dim@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c7503609

include/linux/net.h

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ struct proto_ops { 
				      int optname, char __user *optval, int optlen);

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

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

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

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

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

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

	int		(*sendmsg)   (struct kiocb *iocb, struct socket *sock,

				      struct msghdr *m, size_t total_len);

	int		(*recvmsg)   (struct kiocb *iocb, struct socket *sock,

include/linux/netfilter.h

+9 −0
Original line number Diff line number Diff line
@@ -80,10 +80,14 @@ struct nf_sockopt_ops 
	int set_optmin;

	int set_optmax;

	int (*set)(struct sock *sk, int optval, void __user *user, unsigned int len);

	int (*compat_set)(struct sock *sk, int optval,

			void __user *user, unsigned int len);



	int get_optmin;

	int get_optmax;

	int (*get)(struct sock *sk, int optval, void __user *user, int *len);

	int (*compat_get)(struct sock *sk, int optval,

			void __user *user, int *len);



	/* Number of users inside set() or get(). */

	unsigned int use;
@@ -246,6 +250,11 @@ int nf_setsockopt(struct sock *sk, int pf, int optval, char __user *opt, 
int nf_getsockopt(struct sock *sk, int pf, int optval, char __user *opt,

		  int *len);



int compat_nf_setsockopt(struct sock *sk, int pf, int optval,

		char __user *opt, int len);

int compat_nf_getsockopt(struct sock *sk, int pf, int optval,

		char __user *opt, int *len);



/* Packet queuing */

struct nf_queue_handler {

	int (*outfn)(struct sk_buff *skb, struct nf_info *info,

include/net/inet_connection_sock.h

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,12 @@ struct inet_connection_sock_af_ops { 
				  char __user *optval, int optlen);

	int	    (*getsockopt)(struct sock *sk, int level, int optname, 

				  char __user *optval, int __user *optlen);

	int	    (*compat_setsockopt)(struct sock *sk,

				int level, int optname,

				char __user *optval, int optlen);

	int	    (*compat_getsockopt)(struct sock *sk,

				int level, int optname,

				char __user *optval, int __user *optlen);

	void	    (*addr2sockaddr)(struct sock *sk, struct sockaddr *);

	int sockaddr_len;

};

include/net/ip.h

+4 −0
Original line number Diff line number Diff line
@@ -356,6 +356,10 @@ extern void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb); 
extern int	ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc);

extern int	ip_setsockopt(struct sock *sk, int level, int optname, char __user *optval, int optlen);

extern int	ip_getsockopt(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen);

extern int	compat_ip_setsockopt(struct sock *sk, int level,

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

extern int	compat_ip_getsockopt(struct sock *sk, int level,

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

extern int	ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct sock *));



extern int 	ip_recv_error(struct sock *sk, struct msghdr *msg, int len);

include/net/ipv6.h

+10 −0
Original line number Diff line number Diff line
@@ -520,6 +520,16 @@ extern int ipv6_getsockopt(struct sock *sk, int level, 
						int optname,

						char __user *optval, 

						int __user *optlen);

extern int			compat_ipv6_setsockopt(struct sock *sk,

						int level,

						int optname,

						char __user *optval,

						int optlen);

extern int			compat_ipv6_getsockopt(struct sock *sk,

						int level,

						int optname,

						char __user *optval,

						int __user *optlen);



extern void			ipv6_packet_init(void);