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

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>

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 01e77b8208ce813edc983a330913691396c114f2..72831b8a58fb84f4f875d3e7dff5aef0b4fbab18 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -960,7 +960,8 @@ static inline int svc_port_is_privileged(struct sockaddr *sin)
 static void
 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 socket   *sock = svsk->sk_sock;
        struct socket   *newsock;
@@ -987,8 +988,7 @@ svc_tcp_accept(struct svc_sock *svsk)
        set_bit(SK_CONN, &svsk->sk_flags);
        svc_sock_enqueue(svsk);
 
-       slen = sizeof(sin);
-       err = kernel_getpeername(newsock, (struct sockaddr *) &sin, &slen);
+       err = kernel_getpeername(newsock, sin, &slen);
        if (err < 0) {
                if (net_ratelimit())
                        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
         * 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
                        "%s: connect from unprivileged port: %s\n",
                        serv->sv_name,
-                       __svc_print_addr((struct sockaddr *) &sin, buf,
-                                                               sizeof(buf)));
+                       __svc_print_addr(sin, buf, sizeof(buf)));
        }
        dprintk("%s: connect from %s\n", serv->sv_name,
-               __svc_print_addr((struct sockaddr *) &sin, buf,
-                                sizeof(buf)));
+               __svc_print_addr(sin, buf, sizeof(buf)));
 
        /* make sure that a write doesn't block forever when
         * low on memory
@@ -1019,7 +1017,7 @@ svc_tcp_accept(struct svc_sock *svsk)
        if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
                                 (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
                goto failed;
-       memcpy(&newsvsk->sk_remote, &sin, slen);
+       memcpy(&newsvsk->sk_remote, sin, slen);
        newsvsk->sk_remotelen = slen;
 
        svc_sock_received(newsvsk);