[PATCH] xen/xenbus: fix return type in xenbus_file_read()

Dan Carpenter posted 1 patch 1 year, 7 months ago
Failed in applying to current master (apply log)
drivers/xen/xenbus/xenbus_dev_frontend.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] xen/xenbus: fix return type in xenbus_file_read()
Posted by Dan Carpenter 1 year, 7 months ago
This code tries to store -EFAULT in an unsigned int.  The
xenbus_file_read() function returns type ssize_t so the negative value
is returned as a positive value to the user.

This change forces another change to the min() macro.  Originally, the
min() macro used "unsigned" type which checkpatch complains about.  Also
unsigned type would break if "len" were not capped at MAX_RW_COUNT.  Use
size_t for the min().  (No effect on runtime for the min_t() change).

Fixes: 2fb3683e7b16 ("xen: Add xenbus device driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/xen/xenbus/xenbus_dev_frontend.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index 597af455a522..0792fda49a15 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -128,7 +128,7 @@ static ssize_t xenbus_file_read(struct file *filp,
 {
 	struct xenbus_file_priv *u = filp->private_data;
 	struct read_buffer *rb;
-	unsigned i;
+	ssize_t i;
 	int ret;
 
 	mutex_lock(&u->reply_mutex);
@@ -148,7 +148,7 @@ static ssize_t xenbus_file_read(struct file *filp,
 	rb = list_entry(u->read_buffers.next, struct read_buffer, list);
 	i = 0;
 	while (i < len) {
-		unsigned sz = min((unsigned)len - i, rb->len - rb->cons);
+		size_t sz = min_t(size_t, len - i, rb->len - rb->cons);
 
 		ret = copy_to_user(ubuf + i, &rb->msg[rb->cons], sz);
 
-- 
2.35.1
Re: [PATCH] xen/xenbus: fix return type in xenbus_file_read()
Posted by Juergen Gross 1 year, 7 months ago
On 04.08.22 09:11, Dan Carpenter wrote:
> This code tries to store -EFAULT in an unsigned int.  The
> xenbus_file_read() function returns type ssize_t so the negative value
> is returned as a positive value to the user.
> 
> This change forces another change to the min() macro.  Originally, the
> min() macro used "unsigned" type which checkpatch complains about.  Also
> unsigned type would break if "len" were not capped at MAX_RW_COUNT.  Use
> size_t for the min().  (No effect on runtime for the min_t() change).
> 
> Fixes: 2fb3683e7b16 ("xen: Add xenbus device driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Pushed to xen/tip.git for-linus-6.0


Juergen
Re: [PATCH] xen/xenbus: fix return type in xenbus_file_read()
Posted by Oleksandr Tyshchenko 1 year, 7 months ago
On 04.08.22 10:11, Dan Carpenter wrote:


Hello Dan

> This code tries to store -EFAULT in an unsigned int.  The
> xenbus_file_read() function returns type ssize_t so the negative value
> is returned as a positive value to the user.
>
> This change forces another change to the min() macro.  Originally, the
> min() macro used "unsigned" type which checkpatch complains about.  Also
> unsigned type would break if "len" were not capped at MAX_RW_COUNT.  Use
> size_t for the min().  (No effect on runtime for the min_t() change).
>
> Fixes: 2fb3683e7b16 ("xen: Add xenbus device driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>


I think that patch does correct changes, so

Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>


[snip]


-- 
Regards,

Oleksandr Tyshchenko