net/9p: Return error if we fail to encode protocol data
Subsystems (2)
PATCH 1/2 net/9p: Return error if we fail to encode protocol data
We need to return error in case we fail to encode data in protocl buffer. This patch also return error in case of a failed copy_from_user.
--- net/9p/client.c | 2 ++ net/9p/protocol.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-)
net/9p/client.c +2 -0
@@ -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);
net/9p/protocol.c +2 -3
@@ -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;
Signature · 1 line
1.7.1
PATCH 2/2 net/9p: Return error on read with NULL buffer
From: Sanchit Garg <[email protected]>
This patch ensures that a read(fd, NULL, 0 ) returns EFAULT on a 9p file.
--- net/9p/client.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
net/9p/client.c +6 -4
@@ -1313,6 +1313,11 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, rsize = fid->iounit;if (!rsize || rsize > clnt->msize-P9_IOHDRSZ ) rsize = clnt->msize -P9_IOHDRSZ ; +/* +* A read with NULL user buffer cause EFAULT error +*/ +if (!data && !udata) +return -EFAULT ;if (count < rsize) rsize = count;
@@ -1333,16 +1338,13 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,if (data) {memmove (data, dataptr, count); - } - -if (udata) { + }else { err =copy_to_user (udata, dataptr, count);if (err) { err = -EFAULT ; goto free_and_error; } } -p9_free_req (clnt, req);return count;
Signature · 1 line
1.7.1
Re: [PATCH 2/2] net/9p: Return error on read with NULL buffer
Quoted 1 line · Aneesh Kumar K.V
This patch ensures that a
read(fd, NULL, 0 )returns EFAULT on a 9p file.
Is there some specific reason you want this behavior? I believe the generic Linux code returns success in this case. I tried this exact system call with fd being a pty or a file on ext3 and got 0 for both.
Brad Boyer
[email protected]
Re: [PATCH 2/2] net/9p: Return error on read with NULL buffer
Quoted 6 lines · Brad Boyer
Quoted 1 line · Aneesh Kumar K.V
This patch ensures that a
read(fd, NULL, 0 )returns EFAULT on a 9p file.Is there some specific reason you want this behavior? I believe the generic Linux code returns success in this case. I tried this exact system call with fd being a pty or a file on ext3 and got 0 for both.
Linux code return 0 in case count == 0;
This is what i find on ext4.
open("a.c", O_RDONLY) = 3read(3, 0, 10) = -1 EFAULT (Bad address)
open("a.c", O_RDONLY) = 3read(3, NULL, 0) = 0
This patch ensure that we get the behaviour as in case one in case of 9p file system. But patch broke the behaviour in step 2. So below is the updated one
commit bd1717e5300ab0bb9aa2df139ffbc5e49f1baeb6
Author: Sanchit Garg <[email protected]> Date: Tue Oct 19 09:17:02 2010 +0530
net/9p: Return error on read with NULL buffer
This patch ensures that a read(fd, NULL, 10) returns EFAULT on a 9p file.
net/9p/client.c +1 -4
@@ -1333,16 +1333,13 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,if (data) {memmove (data, dataptr, count); - } - -if (udata) { + }else { err =copy_to_user (udata, dataptr, count);if (err) { err = -EFAULT ; goto free_and_error; } } -p9_free_req (clnt, req);return count;
-aneesh