diff options
| author | Abhishek Kulkarni <adkulkar@umail.iu.edu> | 2009-07-14 13:25:41 -0500 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@vTrogdor.(none)> | 2009-07-14 15:54:41 -0500 |
| commit | eedfe1c4289216af5a0a7f38e6b2c4d3f07c087f (patch) | |
| tree | 5e08b79c88c36ef0607f830523f253305abf8dff /net/9p | |
| parent | a17d1720aa35623a9bef3707b36242706714bca5 (diff) | |
| download | op-kernel-dev-eedfe1c4289216af5a0a7f38e6b2c4d3f07c087f.zip op-kernel-dev-eedfe1c4289216af5a0a7f38e6b2c4d3f07c087f.tar.gz | |
9p: Possible regression in p9_client_stat
Fix a possible regression with p9_client_stat where it can try to kfree
an ERR_PTR after an erroneous p9pdu_readf. Also remove an unnecessary data
buffer increment in p9_client_read.
Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 783a410..787ccdd 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1098,7 +1098,6 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, if (data) { memmove(data, dataptr, count); - data += count; } if (udata) { @@ -1192,9 +1191,9 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid) err = p9pdu_readf(req->rc, clnt->dotu, "wS", &ignored, ret); if (err) { - ret = ERR_PTR(err); p9pdu_dump(1, req->rc); - goto free_and_error; + p9_free_req(clnt, req); + goto error; } P9_DPRINTK(P9_DEBUG_9P, @@ -1211,8 +1210,6 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid) p9_free_req(clnt, req); return ret; -free_and_error: - p9_free_req(clnt, req); error: kfree(ret); return ERR_PTR(err); |
