cifs: fix error handling cifs_user_readv
authorJeff Layton <jlayton@redhat.com>
Tue, 15 Apr 2014 16:48:49 +0000 (12:48 -0400)
committerSteve French <smfrench@gmail.com>
Thu, 17 Apr 2014 03:54:30 +0000 (22:54 -0500)
commitbae9f746a18ee31bbeeb25ae6615805ed6eca173
tree8348a46f641e95a064eb42373023a4878666e8ba
parent8e3ecc87695f4a7e9e217ebd55ca6a39b6a451b8
cifs: fix error handling cifs_user_readv

Coverity says:

*** CID 1202537:  Dereference after null check  (FORWARD_NULL)
/fs/cifs/file.c: 2873 in cifs_user_readv()
2867      cur_len = min_t(const size_t, len - total_read, cifs_sb->rsize);
2868      npages = DIV_ROUND_UP(cur_len, PAGE_SIZE);
2869
2870      /* allocate a readdata struct */
2871      rdata = cifs_readdata_alloc(npages,
2872          cifs_uncached_readv_complete);
>>>     CID 1202537:  Dereference after null check  (FORWARD_NULL)
>>>     Comparing "rdata" to null implies that "rdata" might be null.
2873      if (!rdata) {
2874      rc = -ENOMEM;
2875      goto error;
2876      }
2877
2878      rc = cifs_read_allocate_pages(rdata, npages);

...when we "goto error", rc will be non-zero, and then we end up trying
to do a kref_put on the rdata (which is NULL). Fix this by replacing
the "goto error" with a "break".

Reported-by: <scan-admin@coverity.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/file.c