evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] knfsd: SUNRPC: Support IPv6 addresses in svc_tcp_accept

Browse source 
Modify svc_tcp_accept to support connecting on IPv6 sockets.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
akpm@linux-foundation.org 2007-02-12 00:53:38 -08:00 • committed by Linus Torvalds
parent bcdb81ae29
commit cdd88b9f3e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/sunrpc/svcsock.c
View file

@ -960,7 +960,8 @@ static inline int svc_port_is_privileged(struct sockaddr *sin)
static void static void
svc_tcp_accept(struct svc_sock *svsk) svc_tcp_accept(struct svc_sock *svsk)
{ {
struct sockaddr_in sin; struct sockaddr_storage addr;
struct sockaddr *sin = (struct sockaddr *) &addr;
struct svc_serv *serv = svsk->sk_server; struct svc_serv *serv = svsk->sk_server;
struct socket *sock = svsk->sk_sock; struct socket *sock = svsk->sk_sock;
struct socket *newsock; struct socket *newsock;
@ -987,8 +988,7 @@ svc_tcp_accept(struct svc_sock *svsk)
set_bit(SK_CONN, &svsk->sk_flags); set_bit(SK_CONN, &svsk->sk_flags);
svc_sock_enqueue(svsk); svc_sock_enqueue(svsk);
slen = sizeof(sin); err = kernel_getpeername(newsock, sin, &slen);
err = kernel_getpeername(newsock, (struct sockaddr *) &sin, &slen);
if (err < 0) { if (err < 0) {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_WARNING "%s: peername failed (err %d)!\n", printk(KERN_WARNING "%s: peername failed (err %d)!\n",
@ -1000,16 +1000,14 @@ svc_tcp_accept(struct svc_sock *svsk)
* hosts here, but when we get encryption, the IP of the host won't * hosts here, but when we get encryption, the IP of the host won't
* tell us anything. For now just warn about unpriv connections. * tell us anything. For now just warn about unpriv connections.
*/ */
if (!svc_port_is_privileged((struct sockaddr *) &sin)) { if (!svc_port_is_privileged(sin)) {
dprintk(KERN_WARNING dprintk(KERN_WARNING
"%s: connect from unprivileged port: %s\n", "%s: connect from unprivileged port: %s\n",
serv->sv_name, serv->sv_name,
__svc_print_addr((struct sockaddr *) &sin, buf, __svc_print_addr(sin, buf, sizeof(buf)));
sizeof(buf)));
} }
dprintk("%s: connect from %s\n", serv->sv_name, dprintk("%s: connect from %s\n", serv->sv_name,
__svc_print_addr((struct sockaddr *) &sin, buf, __svc_print_addr(sin, buf, sizeof(buf)));
sizeof(buf)));
/* make sure that a write doesn't block forever when /* make sure that a write doesn't block forever when
* low on memory * low on memory
@ -1019,7 +1017,7 @@ svc_tcp_accept(struct svc_sock *svsk)
if (!(newsvsk = svc_setup_socket(serv, newsock, &err, if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
(SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY)))) (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
goto failed; goto failed;
memcpy(&newsvsk->sk_remote, &sin, slen); memcpy(&newsvsk->sk_remote, sin, slen);
newsvsk->sk_remotelen = slen; newsvsk->sk_remotelen = slen;
svc_sock_received(newsvsk); svc_sock_received(newsvsk);