From: Eric Van Hensbergen <ericvh@gmail.com>
Date: Thu, 14 Jul 2011 00:12:18 +0000 (-0500)
Subject: net/9p: fix client code to fail more gracefully on protocol error
X-Git-Tag: v2.6.33.20~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a56387e77251ae8c76f551593b41c6b52e1a3872;p=thirdparty%2Fkernel%2Fstable.git

net/9p: fix client code to fail more gracefully on protocol error

commit b85f7d92d7bd7e3298159e8b1eed8cb8cbbb0348 upstream.

There was a BUG_ON to protect against a bad id which could be dealt with
more gracefully.

Reported-by: Natalie Orlin <norlin@us.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/9p/client.c b/net/9p/client.c
index 09d4f1e2e4a8c..a442612cb37c9 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -230,7 +230,8 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *c, u16 tag)
 	 * buffer to read the data into */
 	tag++;
 
-	BUG_ON(tag >= c->max_tag);
+	if(tag >= c->max_tag)
+		return NULL;
 
 	row = tag / P9_ROW_MAXTAG;
 	col = tag % P9_ROW_MAXTAG;