Skip to contentSkip to conversation

drivers/virt/fsl_hypervisor: Fix error handling path

PATCH In review Souptick Joarder 3 participants 6 messages Sep 1, 2020 – Sep 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 drivers/virt/fsl_hypervisor: Fix error handling path

First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpin num_pinned pages.

This will address both.

As part of these changes, minor update in documentation.

Fixes 6db7199407ca ("drivers/virt: introduce Freescale hypervisor

management driver")

---
v2:
Added review tag.

v3:
Address review comment on v2 from John.
Added review tag.

v4:
Address another set of review comments from John.

 drivers/virt/fsl_hypervisor.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/virt/fsl_hypervisor.c +8 -9
index 1b0b11b..46ee0a0 100644
@@ -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_fast() */
 	phys_addr_t remote_paddr; /* The next address in the remote buffer */
 	uint32_t count; /* The number of bytes left to copy */
 
@@ -174,7 +174,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 		return -EINVAL;
 
 	/*
-	 * The array of pages returned by get_user_pages() covers only
+	 * The array of pages returned by get_user_pages_fast() covers only
 	 * page-aligned memory.  Since the user buffer is probably not
 	 * page-aligned, we need to handle the discrepancy.
 	 *
@@ -224,7 +224,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 
 	/*
 	 * 'pages' is an array of struct page pointers that's initialized by
-	 * get_user_pages().
+	 * get_user_pages_fast().
 	 */
 	pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
 	if (!pages) {
@@ -241,7 +241,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 	if (!sg_list_unaligned) {
 		pr_debug("fsl-hv: could not allocate S/G list\n");
 		ret = -ENOMEM;
-		goto exit;
+		goto free_pages;
 	}
 	sg_list = PTR_ALIGN(sg_list_unaligned, sizeof(struct fh_sg_list));
 
@@ -250,7 +250,6 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 		num_pages, param.source != -1 ? FOLL_WRITE : 0, pages);
 
 	if (num_pinned != num_pages) {
-		/* get_user_pages() failed */
 		pr_debug("fsl-hv: could not lock source buffer\n");
 		ret = (num_pinned < 0) ? num_pinned : -EFAULT;
 		goto exit;
@@ -292,13 +291,13 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 		virt_to_phys(sg_list), num_pages);
 
 exit:
-	if (pages) {
-		for (i = 0; i < num_pages; i++)
-			if (pages[i])
-				put_page(pages[i]);
+	if (pages && (num_pinned > 0)) {
+		for (i = 0; i < num_pinned; i++)
+			put_page(pages[i]);
 	}
 
 	kfree(sg_list_unaligned);
+free_pages:
 	kfree(pages);
 
 	if (!ret)
Signature · 1 line
1.9.1
#1 lore raw
Quoted 8 lines · Souptick Joarder

First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpin num_pinned pages.

This will address both.

Quoted 8 lines

As part of these changes, minor update in documentation.

Fixes 6db7199407ca ("drivers/virt: introduce Freescale hypervisor

management driver")

---

This looks good to me.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
Quoted 80 lines

v2:
Added review tag.

v3:
Address review comment on v2 from John.
Added review tag.

v4:
Address another set of review comments from John.

  drivers/virt/fsl_hypervisor.c | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
drivers/virt/fsl_hypervisor.c +8 -9
index 1b0b11b..46ee0a0 100644
@@ -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_fast() */
  	phys_addr_t remote_paddr; /* The next address in the remote buffer */
  	uint32_t count; /* The number of bytes left to copy */
 
@@ -174,7 +174,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
  		return -EINVAL;
 
  	/*
-	 * The array of pages returned by get_user_pages() covers only
+	 * The array of pages returned by get_user_pages_fast() covers only
  	 * page-aligned memory.  Since the user buffer is probably not
  	 * page-aligned, we need to handle the discrepancy.
  	 *
@@ -224,7 +224,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 
  	/*
  	 * 'pages' is an array of struct page pointers that's initialized by
-	 * get_user_pages().
+	 * get_user_pages_fast().
  	 */
  	pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
  	if (!pages) {
@@ -241,7 +241,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
  	if (!sg_list_unaligned) {
  		pr_debug("fsl-hv: could not allocate S/G list\n");
  		ret = -ENOMEM;
-		goto exit;
+		goto free_pages;
  	}
  	sg_list = PTR_ALIGN(sg_list_unaligned, sizeof(struct fh_sg_list));
 
@@ -250,7 +250,6 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
  		num_pages, param.source != -1 ? FOLL_WRITE : 0, pages);
 
  	if (num_pinned != num_pages) {
-		/* get_user_pages() failed */
  		pr_debug("fsl-hv: could not lock source buffer\n");
  		ret = (num_pinned < 0) ? num_pinned : -EFAULT;
  		goto exit;
@@ -292,13 +291,13 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
  		virt_to_phys(sg_list), num_pages);
 
  exit:
-	if (pages) {
-		for (i = 0; i < num_pages; i++)
-			if (pages[i])
-				put_page(pages[i]);
+	if (pages && (num_pinned > 0)) {
+		for (i = 0; i < num_pinned; i++)
+			put_page(pages[i]);
  	}
 
  	kfree(sg_list_unaligned);
+free_pages:
  	kfree(pages);
 
  	if (!ret)
#2 lore raw

Hi Andrew,

Quoted 12 lines · John Hubbard
Quoted 10 lines · Souptick Joarder

First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpin num_pinned pages.

This will address both.

As part of these changes, minor update in documentation.

Quoted 8 lines
Quoted 6 lines
Fixes 6db7199407ca ("drivers/virt: introduce Freescale hypervisor

management driver")

---

This looks good to me.

Can you please take this patch through the mm tree ?

Quoted 87 lines

thanks,
--
John Hubbard
NVIDIA

Quoted 80 lines

v2:
Added review tag.

v3:
Address review comment on v2 from John.
Added review tag.

v4:
Address another set of review comments from John.

  drivers/virt/fsl_hypervisor.c | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
drivers/virt/fsl_hypervisor.c +8 -9
index 1b0b11b..46ee0a0 100644
@@ -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_fast() */
      phys_addr_t remote_paddr; /* The next address in the remote buffer */
      uint32_t count; /* The number of bytes left to copy */
 
@@ -174,7 +174,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
              return -EINVAL;
 
      /*
-      * The array of pages returned by get_user_pages() covers only
+      * The array of pages returned by get_user_pages_fast() covers only
       * page-aligned memory.  Since the user buffer is probably not
       * page-aligned, we need to handle the discrepancy.
       *
@@ -224,7 +224,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
 
      /*
       * 'pages' is an array of struct page pointers that's initialized by
-      * get_user_pages().
+      * get_user_pages_fast().
       */
      pages = kcalloc(num_pages, sizeof(struct page *), GFP_KERNEL);
      if (!pages) {
@@ -241,7 +241,7 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
      if (!sg_list_unaligned) {
              pr_debug("fsl-hv: could not allocate S/G list\n");
              ret = -ENOMEM;
-             goto exit;
+             goto free_pages;
      }
      sg_list = PTR_ALIGN(sg_list_unaligned, sizeof(struct fh_sg_list));
 
@@ -250,7 +250,6 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
              num_pages, param.source != -1 ? FOLL_WRITE : 0, pages);
 
      if (num_pinned != num_pages) {
-             /* get_user_pages() failed */
              pr_debug("fsl-hv: could not lock source buffer\n");
              ret = (num_pinned < 0) ? num_pinned : -EFAULT;
              goto exit;
@@ -292,13 +291,13 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
              virt_to_phys(sg_list), num_pages);
 
  exit:
-     if (pages) {
-             for (i = 0; i < num_pages; i++)
-                     if (pages[i])
-                             put_page(pages[i]);
+     if (pages && (num_pinned > 0)) {
+             for (i = 0; i < num_pinned; i++)
+                     put_page(pages[i]);
      }
 
      kfree(sg_list_unaligned);
+free_pages:
      kfree(pages);
 
      if (!ret)
#3 lore raw
Quoted 22 lines · Souptick Joarder

Hi Andrew,

Quoted 19 lines · John Hubbard
Quoted 16 lines · Souptick Joarder

First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpin num_pinned pages.

This will address both.

As part of these changes, minor update in documentation.

Fixes 6db7199407ca ("drivers/virt: introduce Freescale hypervisor

management driver")

---

Quoted 4 lines
Quoted 1 line

This looks good to me.

Can you please take this patch through the mm tree ?

Is there a problem with sending it through it's normal tree? It would probably get better testing coverage there.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
#4 lore raw
Quoted 24 lines · John Hubbard
Quoted 22 lines · Souptick Joarder

Hi Andrew,

Quoted 19 lines · John Hubbard
Quoted 16 lines · Souptick Joarder

First, when memory allocation for sg_list_unaligned failed, there is a bug of calling put_pages() as we haven't pinned any pages.

Second, if get_user_pages_fast() failed we should unpin num_pinned pages.

This will address both.

As part of these changes, minor update in documentation.

Fixes 6db7199407ca ("drivers/virt: introduce Freescale hypervisor

management driver")

---

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

This looks good to me.

Can you please take this patch through the mm tree ?

Is there a problem with sending it through it's normal tree? It would probably get better testing coverage there.

scripts/get_maintainer.pl is showing only general lkml list and few commit signer.
I didn't receive any feedback from anyone except you & Dan in more than 12+ weeks
and mail bounced back from actual author Timur Tabi.

As it is more than 12 weeks, I requested Andrew to take it through mm tree.

Note -

While running ./scripts/get_maintainer.pl, I observed one issue. Everytime I run the script, list is getting changed. Is it an expected behaviour ?

Below is the details ->

jordon@jordon-HP-15-Notebook-PC:~/Documents/virt/linux-next$ ./scripts/get_maintainer.pl 0001-drivers-virt-fsl_hypervisor-Fix-error-handling-path.patch
Bjorn Andersson <[email protected]> (commit_signer:1/1=100%) Daniel Vetter <[email protected]> (commit_signer:1/1=100%)
Dan Williams <[email protected]> (commit_signer:1/1=100%) "Darren Hart (VMware)" <[email protected]> (commit_signer:1/1=100%) Greg Kroah-Hartman <[email protected]> (commit_signer:1/1=100%) Arnd Bergmann <[email protected]> (authored:1/1=100%,added_lines:1/1=100%,removed_lines:1/1=100%,blamed_fixes:1/1=100%) Timur Tabi <[email protected]> (blamed_fixes:1/1=100%)
Kumar Gala <[email protected]> (blamed_fixes:1/1=100%) [email protected] (open list)

jordon@jordon-HP-15-Notebook-PC:~/Documents/virt/linux-next$ ./scripts/get_maintainer.pl 0001-drivers-virt-fsl_hypervisor-Fix-error-handling-path.patch
Bjorn Andersson <[email protected]> (commit_signer:1/1=100%) Daniel Vetter <[email protected]> (commit_signer:1/1=100%)
Dan Williams <[email protected]> (commit_signer:1/1=100%) "Darren Hart (VMware)" <[email protected]> (commit_signer:1/1=100%) Greg Kroah-Hartman <[email protected]> (commit_signer:1/1=100%) Arnd Bergmann <[email protected]> (authored:1/1=100%,added_lines:1/1=100%,removed_lines:1/1=100%,blamed_fixes:1/1=100%) Timur Tabi <[email protected]> (blamed_fixes:1/1=100%)
Kumar Gala <[email protected]> (blamed_fixes:1/1=100%) [email protected] (open list)

jordon@jordon-HP-15-Notebook-PC:~/Documents/virt/linux-next$ ./scripts/get_maintainer.pl 0001-drivers-virt-fsl_hypervisor-Fix-error-handling-path.patch
Bjorn Andersson <[email protected]> (commit_signer:1/1=100%) Daniel Vetter <[email protected]> (commit_signer:1/1=100%)
Dan Williams <[email protected]> (commit_signer:1/1=100%) "Darren Hart (VMware)" <[email protected]> (commit_signer:1/1=100%) Greg Kroah-Hartman <[email protected]> (commit_signer:1/1=100%) Arnd Bergmann <[email protected]> (authored:1/1=100%,added_lines:1/1=100%,removed_lines:1/1=100%,blamed_fixes:1/1=100%) Timur Tabi <[email protected]> (blamed_fixes:1/1=100%)
Kumar Gala <[email protected]> (blamed_fixes:1/1=100%) [email protected] (open list)

Quoted 6 lines

thanks,
--
John Hubbard
NVIDIA