Skip to content

Commit

Permalink
net/9p: Return error if we fail to encode protocol data
Browse files Browse the repository at this point in the history
We need to return error in case we fail to encode data in protocol buffer.
This patch also return error in case of a failed copy_from_user.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  • Loading branch information
Aneesh Kumar K.V authored and Eric Van Hensbergen committed Oct 28, 2010
1 parent 877cb3d commit 7b3bb3f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
va_start(ap, fmt);
err = p9pdu_vwritef(req->tc, c->proto_version, fmt, ap);
va_end(ap);
if (err)
goto reterr;
p9pdu_finalize(req->tc);

err = c->trans_mod->request(c, req);
Expand Down
5 changes: 2 additions & 3 deletions net/9p/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,8 @@ static size_t
pdu_write_u(struct p9_fcall *pdu, const char __user *udata, size_t size)
{
size_t len = MIN(pdu->capacity - pdu->size, size);
int err = copy_from_user(&pdu->sdata[pdu->size], udata, len);
if (err)
printk(KERN_WARNING "pdu_write_u returning: %d\n", err);
if (copy_from_user(&pdu->sdata[pdu->size], udata, len))
len = 0;

pdu->size += len;
return size - len;
Expand Down

0 comments on commit 7b3bb3f

Please sign in to comment.