From 6b7da3f2eb2b5a671b68846044eb5ad7ae567dc7 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 18 Mar 2009 20:45:28 -0400
Subject: [PATCH] --- yaml --- r: 139544 b: refs/heads/master c:
 776bd5c7a207de546918f805090bfc823d2660c8 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/net/sunrpc/rpcb_clnt.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9ac08af1687f..c838ff70bc0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fe5c398fc2186ed586db11106a6692d871d0d58
+refs/heads/master: 776bd5c7a207de546918f805090bfc823d2660c8
diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c
index 03ae007641e4..2caa7edeeaba 100644
--- a/trunk/net/sunrpc/rpcb_clnt.c
+++ b/trunk/net/sunrpc/rpcb_clnt.c
@@ -703,11 +703,16 @@ static int rpcb_decode_getaddr(struct rpc_rqst *req, __be32 *p,
 	*portp = 0;
 	addr_len = ntohl(*p++);
 
+	if (addr_len == 0) {
+		dprintk("RPC:       rpcb_decode_getaddr: "
+					"service is not registered\n");
+		return 0;
+	}
+
 	/*
-	 * Simple sanity check.  The smallest possible universal
-	 * address is an IPv4 address string containing 11 bytes.
+	 * Simple sanity check.
 	 */
-	if (addr_len < 11 || addr_len > RPCBIND_MAXUADDRLEN)
+	if (addr_len > RPCBIND_MAXUADDRLEN)
 		goto out_err;
 
 	/*