1 files changed, 18 insertions, 16 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 039444eb138f..9bb86cd3ee56 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -129,7 +129,7 @@ static struct ctl_table xs_tunables_table[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &xprt_min_resvport_limit,
-                .extra2         = &xprt_max_resvport
+                .extra2         = &xprt_max_resvport_limit
         },
         {
                 .procname       = "max_resvport",
@@ -137,7 +137,7 @@ static struct ctl_table xs_tunables_table[] = {
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .extra1         = &xprt_min_resvport,
+                .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
         {
@@ -1615,11 +1615,17 @@ static void xs_udp_timer(struct rpc_xprt *xprt, struct rpc_task *task)
         spin_unlock_bh(&xprt->transport_lock);
 }
 
-static unsigned short xs_get_random_port(void)
+static int xs_get_random_port(void)
 {
-        unsigned short range = xprt_max_resvport - xprt_min_resvport + 1;
-        unsigned short rand = (unsigned short) prandom_u32() % range;
-        return rand + xprt_min_resvport;
+        unsigned short min = xprt_min_resvport, max = xprt_max_resvport;
+        unsigned short range;
+        unsigned short rand;
+
+        if (max < min)
+                return -EADDRINUSE;
+        range = max - min + 1;
+        rand = (unsigned short) prandom_u32() % range;
+        return rand + min;
 }
 
 /**
@@ -1675,9 +1681,9 @@ static void xs_set_srcport(struct sock_xprt *transport, struct socket *sock)
                 transport->srcport = xs_sock_getport(sock);
 }
 
-static unsigned short xs_get_srcport(struct sock_xprt *transport)
+static int xs_get_srcport(struct sock_xprt *transport)
 {
-        unsigned short port = transport->srcport;
+        int port = transport->srcport;
 
         if (port == 0 && transport->xprt.resvport)
                 port = xs_get_random_port();
@@ -1698,7 +1704,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)
 {
         struct sockaddr_storage myaddr;
         int err, nloop = 0;
-        unsigned short port = xs_get_srcport(transport);
+        int port = xs_get_srcport(transport);
         unsigned short last;
 
         /*
@@ -1716,8 +1722,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)
          * transport->xprt.resvport == 1) xs_get_srcport above will
          * ensure that port is non-zero and we will bind as needed.
          */
-        if (port == 0)
-                return 0;
+        if (port <= 0)
+                return port;
 
         memcpy(&myaddr, &transport->srcaddr, transport->xprt.addrlen);
         do {
@@ -3154,12 +3160,8 @@ static int param_set_uint_minmax(const char *val,
 
 static int param_set_portnr(const char *val, const struct kernel_param *kp)
 {
-        if (kp->arg == &xprt_min_resvport)
-                return param_set_uint_minmax(val, kp,
-                        RPC_MIN_RESVPORT,
-                        xprt_max_resvport);
         return param_set_uint_minmax(val, kp,
-                        xprt_min_resvport,
+                        RPC_MIN_RESVPORT,
                         RPC_MAX_RESVPORT);
 }