From 995b8515928155f28c8771d9340ec5c5259a4ef9 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Tue, 19 Oct 2010 09:17:02 +0530 Subject: [PATCH] --- yaml --- r: 218960 b: refs/heads/master c: 7b3bb3fe166702b504f1068359c9550d3b277eaf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/9p/client.c | 2 ++ trunk/net/9p/protocol.c | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a81c88ea4621..70ff029a3db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 877cb3d4dd73838adcc6b79f2a3d29b155e7ebbe +refs/heads/master: 7b3bb3fe166702b504f1068359c9550d3b277eaf diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c index bc7b03537699..e3cfdff37327 100644 --- a/trunk/net/9p/client.c +++ b/trunk/net/9p/client.c @@ -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); diff --git a/trunk/net/9p/protocol.c b/trunk/net/9p/protocol.c index 3acd3afb20c8..45c15f491401 100644 --- a/trunk/net/9p/protocol.c +++ b/trunk/net/9p/protocol.c @@ -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;