Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux

[linux-drm-fsl-dcu.git] / net / sunrpc / rpcb_clnt.c

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index a70acae496e44d6c872ba7c93d4d9ce56c2f7f00..795a0f4e920bf8b4e52e78458b210fea02df8132 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include <linux/nsproxy.h>
 #include <net/ipv6.h>
 
 #include <linux/sunrpc/clnt.h>
@@ -884,7 +883,10 @@ static void encode_rpcb_string(struct xdr_stream *xdr, const char *string,
        u32 len;
 
        len = strlen(string);
-       BUG_ON(len > maxstrlen);
+       WARN_ON_ONCE(len > maxstrlen);
+       if (len > maxstrlen)
+               /* truncate and hope for the best */
+               len = maxstrlen;
        p = xdr_reserve_space(xdr, 4 + len);
        xdr_encode_opaque(p, string, len);
 }