Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1218129

[PATCH] 9p: trans_fd, initialize recv fcall properly if not set

From Dominique Martinet <dominique.martinet@cea.fr>
Newsgroups linux.kernel
Subject [PATCH] 9p: trans_fd, initialize recv fcall properly if not set
Date 2015-09-03 11:40 +0200
Message-ID <q4z9U-84h-33@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


That code really should never be called (rc is allocated in
tag_alloc), but if it had been it couldn't have worked...

Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
---
 net/9p/trans_fd.c | 3 +++
 1 file changed, 3 insertions(+)

To be honest, I think it might be better to just bail out if we get in
this switch (m->req->rc == NULL after p9_tag_lookup) and not try to
allocate more, because if we get there it's likely a race condition and
silently re-allocating will end up in more troubles than trying to
recover is worth.
Thoughts ?

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index a270dcc..0d9831a 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -363,6 +363,9 @@ static void p9_read_work(struct work_struct *work)
 				err = -ENOMEM;
 				goto error;
 			}
+			m->req->rc.capacity = m->client->msize;
+			m->req->rc.sdata = (char*)m->req->rc +
+						sizeof(struct p9_fcall);
 		}
 		m->rc.sdata = (char *)m->req->rc + sizeof(struct p9_fcall);
 		memcpy(m->rc.sdata, m->tmp_buf, m->rc.capacity);
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread


Thread

[PATCH] 9p: trans_fd, initialize recv fcall properly if not set Dominique Martinet <dominique.martinet@cea.fr> - 2015-09-03 11:40 +0200
  Re: [PATCH] 9p: trans_fd, initialize recv fcall properly if not set Eric Van Hensbergen <ericvh@gmail.com> - 2015-09-06 05:20 +0200
    Re: [V9fs-developer] [PATCH] 9p: trans_fd, initialize recv fcall  properly if not set Dominique Martinet <dominique.martinet@cea.fr> - 2015-09-06 09:00 +0200

csiph-web