[PATCH] knfsd: SUNRPC: fix up svc_create_socket() to take a sockaddr struct + length

Replace existing svc_create_socket() API to allow callers to pass addresses
larger than a sockaddr_in.

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 6f509b9cae2c8b136d8363ec36470e38109a697b..63ae94771b8e589e851eb94fc154599b5fc0754f 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1700,7 +1700,7 @@ EXPORT_SYMBOL_GPL(svc_addsock);
  * Create socket for RPC service.
  */
 static int svc_create_socket(struct svc_serv *serv, int protocol,
-                               struct sockaddr_in *sin, int flags)
+                               struct sockaddr *sin, int len, int flags)
 {
        struct svc_sock *svsk;
        struct socket   *sock;
@@ -1710,8 +1710,7 @@ static int svc_create_socket(struct svc_serv *serv, int protocol,
 
        dprintk("svc: svc_create_socket(%s, %d, %s)\n",
                        serv->sv_program->pg_name, protocol,
-                       __svc_print_addr((struct sockaddr *) sin, buf,
-                                                               sizeof(buf)));
+                       __svc_print_addr(sin, buf, sizeof(buf)));
 
        if (protocol != IPPROTO_UDP && protocol != IPPROTO_TCP) {
                printk(KERN_WARNING "svc: only UDP and TCP "
@@ -1720,15 +1719,15 @@ static int svc_create_socket(struct svc_serv *serv, int protocol,
        }
        type = (protocol == IPPROTO_UDP)? SOCK_DGRAM : SOCK_STREAM;
 
-       if ((error = sock_create_kern(PF_INET, type, protocol, &sock)) < 0)
+       error = sock_create_kern(sin->sa_family, type, protocol, &sock);
+       if (error < 0)
                return error;
 
        svc_reclassify_socket(sock);
 
        if (type == SOCK_STREAM)
-               sock->sk->sk_reuse = 1; /* allow address reuse */
-       error = kernel_bind(sock, (struct sockaddr *) sin,
-                                       sizeof(*sin));
+               sock->sk->sk_reuse = 1;         /* allow address reuse */
+       error = kernel_bind(sock, sin, len);
        if (error < 0)
                goto bummer;
 
@@ -1818,7 +1817,8 @@ int svc_makesock(struct svc_serv *serv, int protocol, unsigned short port,
        };
 
        dprintk("svc: creating socket proto = %d\n", protocol);
-       return svc_create_socket(serv, protocol, &sin, flags);
+       return svc_create_socket(serv, protocol, (struct sockaddr *) &sin,
+                                                       sizeof(sin), flags);
 }
 
 /*