: Identation & other cleanups related to compat_[gs]etsockopt cset
Subsystems (7)
PATCH 6/9 : Identation & other cleanups related to compat_[gs]etsockopt cset
No code changes, just tidying up, in some cases moving EXPORT_SYMBOLs to just after the function exported, etc.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
net/core/sock.c | 20 +++--- net/dccp/ipv4.c | 72 +++++++++++------------ net/dccp/ipv6.c | 138 ++++++++++++++++++++++---------------------- net/dccp/proto.c | 9 ++- net/ipv4/af_inet.c | 120 +++++++++++++++++++------------------- net/ipv4/ip_sockglue.c | 35 +++++------ net/ipv4/raw.c | 46 +++++++-------- net/ipv4/tcp.c | 16 +++-- net/ipv4/tcp_ipv4.c | 34 +++++------ net/ipv4/udp.c | 48 +++++++-------- net/ipv6/af_inet6.c | 120 +++++++++++++++++++------------------- net/ipv6/ipv6_sockglue.c | 40 ++++++------- net/ipv6/ipv6_syms.c | 4 - net/ipv6/raw.c | 94 ++++++++++++++---------------- net/ipv6/tcp_ipv6.c | 64 ++++++++++---------- net/ipv6/udp.c | 48 ++++++++------- net/netfilter/nf_sockopt.c | 2 - net/sctp/ipv6.c | 92 +++++++++++++++-------------- net/sctp/protocol.c | 94 +++++++++++++++--------------- 19 files changed, 540 insertions(+), 556 deletions(-)
96d51c8c2816c58290a8379ba383eb8d520ab0b4
net/core/sock.c +10 -10
@@ -1397,14 +1397,14 @@ int sock_common_getsockopt(struct socketEXPORT_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) +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_setsockopt) -return sk->sk_prot->compat_getsockopt (sk, level, - optname, optval, optlen); +if (sk->sk_prot->compat_setsockopt !=NULL ) +return sk->sk_prot->compat_getsockopt (sk, level, optname, + optval, optlen);return sk->sk_prot->getsockopt (sk, level, optname, optval, optlen); }EXPORT_SYMBOL (compat_sock_common_getsockopt);
@@ -1440,14 +1440,14 @@ int sock_common_setsockopt(struct socketEXPORT_SYMBOL (sock_common_setsockopt);#ifdef CONFIG_COMPAT -int compat_sock_common_setsockopt (struct socket *sock, -int level,int optname,char __user *optval,int optlen) +int compat_sock_common_setsockopt (struct socket *sock,int level,int optname, +char __user *optval,int optlen) {struct sock *sk = sock->sk; -if (sk->sk_prot->compat_setsockopt) -return sk->sk_prot->compat_setsockopt (sk, level, - optname, optval, optlen); +if (sk->sk_prot->compat_setsockopt !=NULL ) +return sk->sk_prot->compat_setsockopt (sk, level, optname, + optval, optlen);return sk->sk_prot->setsockopt (sk, level, optname, optval, optlen); }EXPORT_SYMBOL (compat_sock_common_setsockopt);
net/dccp/ipv4.c +36 -36
102 lines not on this page · raw message
net/dccp/ipv6.c +69 -69
170 lines not on this page · raw message
net/dccp/proto.c +6 -3
@@ -516,18 +516,19 @@ int dccp_setsockopt(struct sock *sk, int optlen);return do_dccp_setsockopt (sk, level, optname, optval, optlen); } +EXPORT_SYMBOL_GPL (dccp_setsockopt);#ifdef CONFIG_COMPAT int compat_dccp_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user *optval,int optlen) {if (level !=SOL_DCCP )return inet_csk_compat_setsockopt (sk, level, optname, optval, optlen); -return do_dccp_setsockopt (sk, level, optname, optval, optlen); } +EXPORT_SYMBOL_GPL (compat_dccp_setsockopt);#endif
@@ -609,17 +610,19 @@ int dccp_getsockopt(struct sock *sk, int optlen);return do_dccp_getsockopt (sk, level, optname, optval, optlen); } +EXPORT_SYMBOL_GPL (dccp_getsockopt);#ifdef CONFIG_COMPAT int compat_dccp_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user *optval,int __user *optlen) {if (level !=SOL_DCCP )return inet_csk_compat_getsockopt (sk, level, optname, optval, optlen);return do_dccp_getsockopt (sk, level, optname, optval, optlen); } +EXPORT_SYMBOL_GPL (compat_dccp_getsockopt);#endif
net/ipv4/af_inet.c +60 -60
141 lines not on this page · raw message
net/ipv4/ip_sockglue.c +16 -19
@@ -910,8 +910,8 @@ int ip_setsockopt(struct sock *sk, int l }#ifdef CONFIG_COMPAT -int compat_ip_setsockopt (struct sock *sk,int level, -int optname,char __user *optval,int optlen) +int compat_ip_setsockopt (struct sock *sk,int level,int optname, +char __user *optval,int optlen) {int err;
@@ -922,19 +922,21 @@ int compat_ip_setsockopt(struct sock *sk#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err = -ENOPROTOOPT && optname !=IP_HDRINCL && - optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY + optname !=IP_IPSEC_POLICY && optname !=IP_XFRM_POLICY #ifdef CONFIG_IP_MROUTE - && (optname <MRT_BASE || optname > (MRT_BASE +10 )) + && (optname <MRT_BASE || optname > (MRT_BASE +10 )) #endif ) {lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET , - optname, optval, optlen); + err =compat_nf_setsockopt (sk,PF_INET , optname, + optval, optlen);release_sock (sk); }#endif return err; } + +EXPORT_SYMBOL (compat_ip_setsockopt);#endif /*
@@ -1180,27 +1182,24 @@ int ip_getsockopt(struct sock *sk, int l }#ifdef CONFIG_COMPAT -int compat_ip_getsockopt (struct sock *sk,int level, -int optname,char __user *optval,int __user *optlen) +int compat_ip_getsockopt (struct sock *sk,int level,int optname, +char __user *optval,int __user *optlen) { -int err; - - err =do_ip_getsockopt (sk, level, optname, optval, optlen); +int err =do_ip_getsockopt (sk, level, optname, optval, optlen);#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err = -ENOPROTOOPT && optname !=IP_PKTOPTIONS #ifdef CONFIG_IP_MROUTE - && (optname <MRT_BASE || optname >MRT_BASE +10 ) + && (optname <MRT_BASE || optname >MRT_BASE +10 ) #endif ) {int len; -if (get_user (len,optlen)) +if (get_user (len, optlen))return -EFAULT ;lock_sock (sk); - err =compat_nf_getsockopt (sk,PF_INET , - optname, optval, &len); + err =compat_nf_getsockopt (sk,PF_INET , optname, optval, &len);release_sock (sk);if (err >=0 ) err =put_user (len, optlen);
@@ -1209,13 +1208,11 @@ int compat_ip_getsockopt(struct sock *sk#endif return err; } + +EXPORT_SYMBOL (compat_ip_getsockopt);#endif EXPORT_SYMBOL (ip_cmsg_recv);EXPORT_SYMBOL (ip_getsockopt);EXPORT_SYMBOL (ip_setsockopt); -#ifdef CONFIG_COMPAT -EXPORT_SYMBOL (compat_ip_getsockopt); -EXPORT_SYMBOL (compat_ip_setsockopt); -#endif
net/ipv4/raw.c +22 -24
70 lines not on this page · raw message
net/ipv4/tcp.c +8 -8
@@ -1879,14 +1879,16 @@ int tcp_setsockopt(struct sock *sk, int }#ifdef CONFIG_COMPAT -int compat_tcp_setsockopt (struct sock *sk,int level, -int optname,char __user *optval,int optlen) +int compat_tcp_setsockopt (struct sock *sk,int level,int optname, +char __user *optval,int optlen) {if (level !=SOL_TCP )return inet_csk_compat_setsockopt (sk, level, optname, optval, optlen);return do_tcp_setsockopt (sk, level, optname, optval, optlen); } + +EXPORT_SYMBOL (compat_tcp_setsockopt);#endif /* Return information about state of tcp endpoint in API format. */
@@ -2051,14 +2053,16 @@ int tcp_getsockopt(struct sock *sk, int }#ifdef CONFIG_COMPAT -int compat_tcp_getsockopt (struct sock *sk,int level, -int optname,char __user *optval,int __user *optlen) +int compat_tcp_getsockopt (struct sock *sk,int level,int optname, +char __user *optval,int __user *optlen) {if (level !=SOL_TCP )return inet_csk_compat_getsockopt (sk, level, optname, optval, optlen);return do_tcp_getsockopt (sk, level, optname, optval, optlen); } + +EXPORT_SYMBOL (compat_tcp_getsockopt);#endif extern void __skb_cb_too_small_for_tcp (int ,int );
@@ -2177,7 +2181,3 @@ EXPORT_SYMBOL(tcp_sendpage);EXPORT_SYMBOL (tcp_setsockopt);EXPORT_SYMBOL (tcp_shutdown);EXPORT_SYMBOL (tcp_statistics); -#ifdef CONFIG_COMPAT -EXPORT_SYMBOL (compat_tcp_setsockopt); -EXPORT_SYMBOL (compat_tcp_getsockopt); -#endif
net/ipv4/tcp_ipv4.c +17 -17
@@ -1217,21 +1217,21 @@ int tcp_v4_tw_remember_stamp(struct inet }struct inet_connection_sock_af_ops ipv4_specific = { - .queue_xmit = ip_queue_xmit, - .send_check = tcp_v4_send_check, - .rebuild_header = inet_sk_rebuild_header, - .conn_request = tcp_v4_conn_request, - .syn_recv_sock = tcp_v4_syn_recv_sock, - .remember_stamp = tcp_v4_remember_stamp, - .net_header_len =sizeof (struct iphdr ), - .setsockopt = ip_setsockopt, - .getsockopt = ip_getsockopt, + .queue_xmit = ip_queue_xmit, + .send_check = tcp_v4_send_check, + .rebuild_header = inet_sk_rebuild_header, + .conn_request = tcp_v4_conn_request, + .syn_recv_sock = tcp_v4_syn_recv_sock, + .remember_stamp = tcp_v4_remember_stamp, + .net_header_len =sizeof (struct iphdr ), + .setsockopt = ip_setsockopt, + .getsockopt = ip_getsockopt, + .addr2sockaddr = inet_csk_addr2sockaddr, + .sockaddr_len =sizeof (struct sockaddr_in ), #ifdef CONFIG_COMPAT - .compat_setsockopt = compat_ip_setsockopt, - .compat_getsockopt = compat_ip_getsockopt, + .compat_setsockopt = compat_ip_setsockopt, + .compat_getsockopt = compat_ip_getsockopt, #endif - .addr2sockaddr = inet_csk_addr2sockaddr, - .sockaddr_len =sizeof (struct sockaddr_in ), };/* NOTE: A lot of things set to zero explicitly by call to
@@ -1812,10 +1812,6 @@ struct proto tcp_prot = { .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, -#ifdef CONFIG_COMPAT - .compat_setsockopt = compat_tcp_setsockopt, - .compat_getsockopt = compat_tcp_getsockopt, -#endif .sendmsg = tcp_sendmsg, .recvmsg = tcp_recvmsg, .backlog_rcv = tcp_v4_do_rcv,
@@ -1834,6 +1830,10 @@ struct proto tcp_prot = { .obj_size = sizeof(struct tcp_sock), .twsk_prot = &tcp_timewait_sock_ops, .rsk_prot = &tcp_request_sock_ops, +#ifdef CONFIG_COMPAT + .compat_setsockopt = compat_tcp_setsockopt, + .compat_getsockopt = compat_tcp_getsockopt, +#endif };void __init tcp_v4_init (struct net_proto_family *ops)
net/ipv4/udp.c +23 -25
72 lines not on this page · raw message
net/ipv6/af_inet6.c +60 -60
141 lines not on this page · raw message
net/ipv6/ipv6_sockglue.c +20 -20
@@ -645,17 +645,15 @@ int ipv6_setsockopt(struct sock *sk, int#ifdef CONFIG_COMPAT int compat_ipv6_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int optlen) +char __user *optval,int optlen) {int err;if (level =SOL_IP && sk->sk_type !=SOCK_RAW ) { -if (udp_prot.compat_setsockopt) -return udp_prot.compat_setsockopt (sk, level, - optname, optval, optlen); -else -return udp_prot.setsockopt (sk, level, - optname, optval, optlen); +if (udp_prot.compat_setsockopt !=NULL ) +return udp_prot.compat_setsockopt (sk, level, optname, + optval, optlen); +return udp_prot.setsockopt (sk, level, optname, optval, optlen); }if (level !=SOL_IPV6 )
@@ -665,15 +663,17 @@ int compat_ipv6_setsockopt(struct sock *#ifdef CONFIG_NETFILTER /* we need to exclude all possible ENOPROTOOPTs except default case */ if (err = -ENOPROTOOPT && optname !=IPV6_IPSEC_POLICY && - optname !=IPV6_XFRM_POLICY ) { + optname !=IPV6_XFRM_POLICY ) {lock_sock (sk); - err =compat_nf_setsockopt (sk,PF_INET6 , optname, optval, - optlen); + err =compat_nf_setsockopt (sk,PF_INET6 , optname, + optval, optlen);release_sock (sk); }#endif return err; } + +EXPORT_SYMBOL (compat_ipv6_setsockopt);#endif static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr,
@@ -927,20 +927,18 @@ int ipv6_getsockopt(struct sock *sk, int#ifdef CONFIG_COMPAT int compat_ipv6_getsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user *optlen) +char __user *optval,int __user *optlen) {int err;if (level =SOL_IP && sk->sk_type !=SOCK_RAW ) { -if (udp_prot.compat_getsockopt) -return udp_prot.compat_getsockopt (sk, level, - optname, optval, optlen); -else -return udp_prot.getsockopt (sk, level, - optname, optval, optlen); +if (udp_prot.compat_getsockopt !=NULL ) +return udp_prot.compat_getsockopt (sk, level, optname, + optval, optlen); +return udp_prot.getsockopt (sk, level, optname, optval, optlen); } -if (level !=SOL_IPV6 ) +if (level !=SOL_IPV6 )return -ENOPROTOOPT ; err =do_ipv6_getsockopt (sk, level, optname, optval, optlen);
@@ -954,8 +952,8 @@ int compat_ipv6_getsockopt(struct sock *return -EFAULT ;lock_sock (sk); - err =compat_nf_getsockopt (sk,PF_INET6 , optname, optval, - &len); + err =compat_nf_getsockopt (sk,PF_INET6 , + optname, optval, &len);release_sock (sk);if (err >=0 ) err =put_user (len, optlen);
@@ -963,6 +961,8 @@ int compat_ipv6_getsockopt(struct sock *#endif return err; } + +EXPORT_SYMBOL (compat_ipv6_getsockopt);#endif void __init ipv6_packet_init (void )
net/ipv6/ipv6_syms.c +0 -4
@@ -18,10 +18,6 @@ EXPORT_SYMBOL(ip6_route_output);EXPORT_SYMBOL (addrconf_lock);EXPORT_SYMBOL (ipv6_setsockopt);EXPORT_SYMBOL (ipv6_getsockopt); -#ifdef CONFIG_COMPAT -EXPORT_SYMBOL (compat_ipv6_setsockopt); -EXPORT_SYMBOL (compat_ipv6_getsockopt); -#endif EXPORT_SYMBOL (inet6_register_protosw);EXPORT_SYMBOL (inet6_unregister_protosw);EXPORT_SYMBOL (inet6_add_protocol);
net/ipv6/raw.c +45 -49
118 lines not on this page · raw message
net/ipv6/tcp_ipv6.c +30 -34
94 lines not on this page · raw message
net/ipv6/udp.c +24 -24
72 lines not on this page · raw message
net/netfilter/nf_sockopt.c +1 -1
@@ -133,7 +133,7 @@ EXPORT_SYMBOL(nf_getsockopt);#ifdef CONFIG_COMPAT static int compat_nf_sockopt (struct sock *sk,int pf,int val, -char __user *opt,int *len,int get) +char __user *opt,int *len,int get) {struct list_head *i;struct nf_sockopt_ops *ops;
net/sctp/ipv6.c +46 -46
108 lines not on this page · raw message
net/sctp/protocol.c +47 -47
110 lines not on this page · raw message
Signature · 1 line
1.2.2.gd27d