| Date | Wed, 02 Nov 2011 15:13:46 -0700 | From | Greg KH <> | Subject | [020/107] net/9p: fix client code to fail more gracefully on protocol error |
| |
2.6.32-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Eric Van Hensbergen <ericvh@gmail.com>
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>
--- net/9p/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/9p/client.c +++ b/net/9p/client.c @@ -221,7 +221,8 @@ struct p9_req_t *p9_tag_lookup(struct p9 * 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;
|