9p bug fix: return non-zero error value in p9_put_data
PATCH 1/1 9p bug fix: return non-zero error value in p9_put_data
p9_put_data is called by p9_create_twrite which expects it to return a non-zero value on error. This was the reason why every p9_client_write was failing. This patch also adds a check for buffer overflow in p9_put_data.
--- net/9p/conv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
net/9p/conv.c +0 -0
@@ -451,8 +451,11 @@ p9_put_data(struct cbuf *bufp, const char *data,
int count,
unsigned char **pdata)
{
*pdata = buf_alloc(bufp, count);
+ if (buf_check_overflow(bufp))
+ return -EIO;
+
memmove(*pdata, data, count);
- return count;
+ return 0;
}
static int
Thanks,
-- Abhishek
Quoted 43 lines · Abhishek Kulkarni
p9_put_datais called byp9_create_twritewhich expects it to return a non-zero value on error. This was the reason why everyp9_client_writewas failing. This patch also adds a check for buffer overflow inp9_put_data.Signed-off-by Abhishek Kulkarni <[email protected]>--- net/9p/conv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)net/9p/conv.c +4
-1@@ -451,8 +451,11 @@ p9_put_data(struct cbuf *bufp, const char *data,int count, unsigned char **pdata) { *pdata =buf_alloc (bufp, count); +if (buf_check_overflow (bufp)) +return -EIO ; +memmove (*pdata, data, count); -return count; +return 0 ; }static int
Thanks,
-- Abhishek-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
V9fs-developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/v9fs-developer
Quoted 5 lines · Abhishek Kulkarni
p9_put_datais called byp9_create_twritewhich expects it to return a non-zero value on error. This was the reason why everyp9_client_writewas failing. This patch also adds a check for buffer overflow inp9_put_data.
I'm a bit confused about when this is even getting called -- O thought all writes were following the p9_client_uwrite path?
Also, we do the bufoverflow check in p9_create_write -- so with your patch aren't we doing this twice?
-eric
Quoted 28 lines
Signed-off-by Abhishek Kulkarni <[email protected]>--- net/9p/conv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)net/9p/conv.c +4
-1@@ -451,8 +451,11 @@ p9_put_data(struct cbuf *bufp, const char *data,int count, unsigned char **pdata) { *pdata =buf_alloc (bufp, count); +if (buf_check_overflow (bufp)) +return -EIO ; +memmove (*pdata, data, count); -return count; +return 0 ; }static int
Thanks,
-- Abhishek
Quoted 9 lines · Eric Van Hensbergen
Quoted 5 lines · Abhishek Kulkarni
p9_put_datais called byp9_create_twritewhich expects it to return a non-zero value on error. This was the reason why everyp9_client_writewas failing. This patch also adds a check for buffer overflow inp9_put_data.I'm a bit confused about when this is even getting called -- O thought all writes were following the
p9_client_uwritepath?
Yes, this bug didn't come up to the surface since p9_create_twrite is not even being called anywhere in v9fs. I tripped over it when using 9p for a different module that I am working on.
Quoted 4 lines
Also, we do the bufoverflow check in
p9_create_write-- so with your patch aren't we doing this twice?
Yes, but then that makes the "check for error in return value" in p9_create_twrite useless since memmove is not going to return an error in any case.
Going with the existing convention however, I think the bufoverflow check is unnecessary in p9_put_data and so is the check for error on return.
I'll resubmit a patch.
-- Abhishek
Quoted 31 lines
-eric
Quoted 28 lines
Signed-off-by Abhishek Kulkarni <[email protected]>--- net/9p/conv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)net/9p/conv.c +4
-1@@ -451,8 +451,11 @@ p9_put_data(struct cbuf *bufp, const char *data,int count, unsigned char **pdata) { *pdata =buf_alloc (bufp, count); +if (buf_check_overflow (bufp)) +return -EIO ; +memmove (*pdata, data, count); -return count; +return 0 ; }static int
Thanks,
-- Abhishek
Resubmitting my previous 9p bug fix patch that removes the bogus return value in p9_put_data which made every p9_client_write fail.
--- net/9p/conv.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-)
net/9p/conv.c +0 -0
@@ -446,13 +446,12 @@ p9_put_str(struct cbuf *bufp, char *data, struct
p9_str *str)
}
}
-static int
+static void
p9_put_data(struct cbuf *bufp, const char *data, int count,
unsigned char **pdata)
{
*pdata = buf_alloc(bufp, count);
memmove(*pdata, data, count);- return count;
}
static int
@@ -851,7 +850,7 @@ EXPORT_SYMBOL(p9_create_tread);
struct p9_fcall *p9_create_twrite(u32 fid, u64 offset, u32 count,
const char *data)
{
- int size, err;
+ int size;
struct p9_fcall *fc;
struct cbuf buffer;
struct cbuf *bufp = &buffer;
@@ -865,12 +864,7 @@ struct p9_fcall *p9_create_twrite(u32 fid, u64
offset, u32 count,
p9_put_int32(bufp, fid, &fc->params.twrite.fid);
p9_put_int64(bufp, offset, &fc->params.twrite.offset);
p9_put_int32(bufp, count, &fc->params.twrite.count);
- err = p9_put_data(bufp, data, count, &fc->params.twrite.data);
- if (err) {
- kfree(fc);
- fc = ERR_PTR(err);
- goto error;- }
+ p9_put_data(bufp, data, count, &fc->params.twrite.data);
if (buf_check_overflow(bufp)) {
kfree(fc);--
1.5.4.3
Quoted 63 lines · Abhishek Kulkarni
Quoted 9 lines · Eric Van Hensbergen
Quoted 5 lines · Abhishek Kulkarni
p9_put_datais called byp9_create_twritewhich expects it to return a non-zero value on error. This was the reason why everyp9_client_writewas failing. This patch also adds a check for buffer overflow inp9_put_data.I'm a bit confused about when this is even getting called -- O thought all writes were following the
p9_client_uwritepath?Yes, this bug didn't come up to the surface since
p9_create_twriteis not even being called anywhere in v9fs. I tripped over it when using 9p for a different module that I am working on.Quoted 4 lines
Also, we do the bufoverflow check in
p9_create_write-- so with your patch aren't we doing this twice?Yes, but then that makes the "check for error in return value" in
p9_create_twriteuseless since memmove is not going to return an error in any case.Going with the existing convention however, I think the bufoverflow check is unnecessary in
p9_put_dataand so is the check for error on return.I'll resubmit a patch.
-- Abhishek
Quoted 31 lines
-eric
Quoted 28 lines
Signed-off-by Abhishek Kulkarni <[email protected]>--- net/9p/conv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)net/9p/conv.c +4
-1@@ -451,8 +451,11 @@ p9_put_data(struct cbuf *bufp, const char *data,int count, unsigned char **pdata) { *pdata =buf_alloc (bufp, count); +if (buf_check_overflow (bufp)) +return -EIO ; +memmove (*pdata, data, count); -return count; +return 0 ; }static int
Thanks,
-- Abhishek
Hey - first of all, sorry for the long delay on responding to this, I've just gotten back to my patch queue.
Quoted 5 lines · Abhishek Kulkarni
Resubmitting my previous 9p bug fix patch that removes the bogus return value in
p9_put_datawhich made everyp9_client_writefail.Signed-off-by Abhishek Kulkarni <[email protected]>---
Please include the original description when resubmitting patches -- this will allow me to suck it into my tree more effectively.
Review
Quoted 11 lines
(quoted diff) +1
-2-static int +static void p9_put_data(struct cbuf *bufp, const char *data, int count, unsigned char **pdata) { *pdata = buf_alloc(bufp, count); memmove(*pdata, data, count); - return count; }
What happens if buf_alloc returns NULL?
Isn't the right behavior something more along the lines of:
static int
p9_put_data(struct cbuf *bufp, const char *data, int count,
unsigned char **pdata)
{
*pdata = buf_alloc(bufp, count);'
if(*pdata)
memmove(*pdata, data, count);
return 0;
else
return ENOMEM;
}-eric