summaryrefslogtreecommitdiffstats
path: root/net/9p
diff options
context:
space:
mode:
authorDominique Martinet <dominique.martinet@cea.fr>2015-09-07 17:06:54 +0200
committerEric Van Hensbergen <ericvh@gmail.com>2015-11-14 08:12:41 -0600
commit3053600ed4f71115631258f0d64eca0d10b11bdc (patch)
tree46a437bf97ce05340f87b7a3141d5628a434411f /net/9p
parent947867aa195b65471f4767fdf761e3841577f90e (diff)
downloadlinux-stable-3053600ed4f71115631258f0d64eca0d10b11bdc.tar.gz
linux-stable-3053600ed4f71115631258f0d64eca0d10b11bdc.tar.bz2
linux-stable-3053600ed4f71115631258f0d64eca0d10b11bdc.zip
9p: trans_fd, bail out if recv fcall if missing
req->rc is pre-allocated early on with p9_tag_alloc and shouldn't be missing Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
-rw-r--r--net/9p/trans_fd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index a270dcc4ad9a..7bc2208b6cc4 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -356,13 +356,12 @@ static void p9_read_work(struct work_struct *work)
}
if (m->req->rc == NULL) {
- m->req->rc = kmalloc(sizeof(struct p9_fcall) +
- m->client->msize, GFP_NOFS);
- if (!m->req->rc) {
- m->req = NULL;
- err = -ENOMEM;
- goto error;
- }
+ p9_debug(P9_DEBUG_ERROR,
+ "No recv fcall for tag %d (req %p), disconnecting!\n",
+ m->rc.tag, m->req);
+ m->req = NULL;
+ err = -EIO;
+ goto error;
}
m->rc.sdata = (char *)m->req->rc + sizeof(struct p9_fcall);
memcpy(m->rc.sdata, m->tmp_buf, m->rc.capacity);