lkml.org 
[lkml]   [2012]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 036/165] net/9p: fix client code to fail more gracefully on protocol error
    Date
    From: Eric Van Hensbergen <ericvh@gmail.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    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: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    net/9p/client.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/9p/client.c b/net/9p/client.c
    index 0aa79fa..583fd03 100644
    --- a/net/9p/client.c
    +++ b/net/9p/client.c
    @@ -272,7 +272,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;
    --
    1.7.12.rc2


    \
     
     \ /
      Last update: 2012-08-15 23:45    [W:4.072 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site