Re: [PATCH v2] drivers/virt/fsl_hypervisor: Correcting error handling path

From: John Hubbard
Date: Wed Jul 29 2020 - 21:00:13 EST


On 7/29/20 12:01 PM, Souptick Joarder wrote:
First, when memory allocation for sg_list_unaligned failed, there
is no point of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpinned num_pinned
pages, no point of checking till num_pages.

Hi Souptick,

For both of the above, the wording "no point" is so overly gentle as
to be misleading. That's because calling put_page() on any pages beyond
num_pinned is a *bug*.

So let's reword that. And let's change the patch subject from "Correcting" to
"fix".

And probably good to add a Fixes: tag, too.

More:


This will address both.

Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: John Hubbard <jhubbard@xxxxxxxxxx>
---
v2:
Added review tag.

drivers/virt/fsl_hypervisor.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index 1b0b11b..ea344d7 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -157,7 +157,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
unsigned int i;
long ret = 0;
- int num_pinned; /* return value from get_user_pages() */
+ int num_pinned = 0; /* return value from get_user_pages() */
phys_addr_t remote_paddr; /* The next address in the remote buffer */
uint32_t count; /* The number of bytes left to copy */
@@ -293,7 +293,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
exit:
if (pages) {
- for (i = 0; i < num_pages; i++)
+ for (i = 0; i < num_pinned; i++)
if (pages[i])

I suspect that this "if" is unnecessary now.

Either way, the diff itself looks good to me, so with the wording changes to
the commit description, you can add:

Reviewed-by: John Hubbard <jhubbard@xxxxxxxxxx>

thanks,
--
John Hubbard
NVIDIA

put_page(pages[i]);
}