lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ICSK] compat: Introduce inet_csk_compat_[gs]etsockopt

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2006-03-20 22:46:16 -08:00
committed by David S. Miller
parent d1d47beef8
commit dec73ff029
4 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/inet_connection_sock.h
View File

@@ -331,4 +331,9 @@ extern int inet_csk_ctl_sock_create(struct socket **sock,
unsigned short family, unsigned short family,
unsigned short type, unsigned short type,
unsigned char protocol); unsigned char protocol);
extern int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen);
extern int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, int optlen);
#endif /* _INET_CONNECTION_SOCK_H */ #endif /* _INET_CONNECTION_SOCK_H */

23
net/dccp/proto.c
View File

@@ -522,14 +522,10 @@ EXPORT_SYMBOL_GPL(dccp_setsockopt);
int compat_dccp_setsockopt(struct sock *sk, int level, int optname, 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) { if (level != SOL_DCCP)
if (inet_csk(sk)->icsk_af_ops->compat_setsockopt) return inet_csk_compat_setsockopt(sk, level, optname,
return inet_csk(sk)->icsk_af_ops->compat_setsockopt(sk, optval, optlen);
level, optname, optval, optlen);
else
return inet_csk(sk)->icsk_af_ops->setsockopt(sk,
level, optname, optval, optlen);
}
return do_dccp_setsockopt(sk, level, optname, optval, optlen); return do_dccp_setsockopt(sk, level, optname, optval, optlen);
} }
EXPORT_SYMBOL_GPL(compat_dccp_setsockopt); EXPORT_SYMBOL_GPL(compat_dccp_setsockopt);
@@ -619,14 +615,9 @@ EXPORT_SYMBOL_GPL(dccp_getsockopt);
int compat_dccp_getsockopt(struct sock *sk, int level, int optname, 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) { if (level != SOL_DCCP)
if (inet_csk(sk)->icsk_af_ops->compat_setsockopt) return inet_csk_compat_getsockopt(sk, level, optname,
return inet_csk(sk)->icsk_af_ops->compat_getsockopt(sk, optval, optlen);
level, optname, optval, optlen);
else
return inet_csk(sk)->icsk_af_ops->getsockopt(sk,
level, optname, optval, optlen);
}
return do_dccp_getsockopt(sk, level, optname, optval, optlen); return do_dccp_getsockopt(sk, level, optname, optval, optlen);
} }
EXPORT_SYMBOL_GPL(compat_dccp_getsockopt); EXPORT_SYMBOL_GPL(compat_dccp_getsockopt);

30
net/ipv4/inet_connection_sock.c
View File

@@ -667,3 +667,33 @@ int inet_csk_ctl_sock_create(struct socket **sock, unsigned short family,
} }
EXPORT_SYMBOL_GPL(inet_csk_ctl_sock_create); EXPORT_SYMBOL_GPL(inet_csk_ctl_sock_create);
#ifdef CONFIG_COMPAT
int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen)
{
const struct inet_csk *icsk = inet_csk(sk);
if (icsk->icsk_af_ops->compat_getsockopt != NULL)
return icsk->icsk_af_ops->compat_getsockopt(sk, level, optname,
optval, optlen);
return icsk->icsk_af_ops->getsockopt(sk, level, optname,
optval, optlen);
}
EXPORT_SYMBOL_GPL(inet_csk_compat_getsockopt);
int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, int optlen)
{
const struct inet_csk *icsk = inet_csk(sk);
if (icsk->icsk_af_ops->compat_setsockopt != NULL)
return icsk->icsk_af_ops->compat_setsockopt(sk, level, optname,
optval, optlen);
return icsk->icsk_af_ops->setsockopt(sk, level, optname,
optval, optlen);
}
EXPORT_SYMBOL_GPL(inet_csk_compat_setsockopt);
#endif

26
net/ipv4/tcp.c
View File

@@ -1882,16 +1882,9 @@ int tcp_setsockopt(struct sock *sk, int level, int optname, char __user *optval,
int compat_tcp_setsockopt(struct sock *sk, int level, int compat_tcp_setsockopt(struct sock *sk, int level,
int optname, char __user *optval, int optlen) int optname, char __user *optval, int optlen)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); if (level != SOL_TCP)
return inet_csk_compat_setsockopt(sk, level, optname,
if (level != SOL_TCP) { optval, optlen);
if (icsk->icsk_af_ops->compat_setsockopt)
return icsk->icsk_af_ops->compat_setsockopt(sk,
level, optname, optval, optlen);
else
return icsk->icsk_af_ops->setsockopt(sk,
level, optname, optval, optlen);
}
return do_tcp_setsockopt(sk, level, optname, optval, optlen); return do_tcp_setsockopt(sk, level, optname, optval, optlen);
} }
#endif #endif
@@ -2061,16 +2054,9 @@ int tcp_getsockopt(struct sock *sk, int level, int optname, char __user *optval,
int compat_tcp_getsockopt(struct sock *sk, int level, int compat_tcp_getsockopt(struct sock *sk, int level,
int optname, char __user *optval, int __user *optlen) int optname, char __user *optval, int __user *optlen)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); if (level != SOL_TCP)
return inet_csk_compat_getsockopt(sk, level, optname,
if (level != SOL_TCP) { optval, optlen);
if (icsk->icsk_af_ops->compat_getsockopt)
return icsk->icsk_af_ops->compat_getsockopt(sk,
level, optname, optval, optlen);
else
return icsk->icsk_af_ops->getsockopt(sk,
level, optname, optval, optlen);
}
return do_tcp_getsockopt(sk, level, optname, optval, optlen); return do_tcp_getsockopt(sk, level, optname, optval, optlen);
} }
#endif #endif