From 6992099d5a2d9a9de1f1fc5ae5e60ec42fd0822a Mon Sep 17 00:00:00 2001 From: Weston Andros Adamson Date: Tue, 23 Oct 2012 10:43:44 -0400 Subject: [PATCH] --- yaml --- r: 346564 b: refs/heads/master c: 332e008a44d1ab6ca85b2214578f2f89af04a2fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/rpcb_clnt.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 715e6050288e..2b67c61354a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8a13d039cbf7aec3b486fc0ae3996a5449afed2 +refs/heads/master: 332e008a44d1ab6ca85b2214578f2f89af04a2fc diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c index a70acae496e4..411f332de0b3 100644 --- a/trunk/net/sunrpc/rpcb_clnt.c +++ b/trunk/net/sunrpc/rpcb_clnt.c @@ -884,7 +884,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); }