]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
9p: move dereference after NULL check
authorDan Carpenter <error27@gmail.com>
Fri, 26 Aug 2011 16:55:59 +0000 (19:55 +0300)
committerEric Van Hensbergen <ericvh@gmail.com>
Mon, 24 Oct 2011 16:13:11 +0000 (11:13 -0500)
We dereferenced "req->tc" and "req->rc" before checking for NULL.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
net/9p/client.c

index 305a4e719b03c34e17265d5a308ae91d9ff6937b..9eadadb0a6987de0ff54840fce2153a5ad65c7a5 100644 (file)
@@ -248,10 +248,8 @@ static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag, int max_size)
                init_waitqueue_head(req->wq);
                req->tc = kmalloc(sizeof(struct p9_fcall) + alloc_msize,
                                  GFP_NOFS);
-               req->tc->capacity = alloc_msize;
                req->rc = kmalloc(sizeof(struct p9_fcall) + alloc_msize,
                                  GFP_NOFS);
-               req->rc->capacity = alloc_msize;
                if ((!req->tc) || (!req->rc)) {
                        printk(KERN_ERR "Couldn't grow tag array\n");
                        kfree(req->tc);
@@ -261,6 +259,8 @@ static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag, int max_size)
                        req->wq = NULL;
                        return ERR_PTR(-ENOMEM);
                }
+               req->tc->capacity = alloc_msize;
+               req->rc->capacity = alloc_msize;
                req->tc->sdata = (char *) req->tc + sizeof(struct p9_fcall);
                req->rc->sdata = (char *) req->rc + sizeof(struct p9_fcall);
        }