drivers/virt/fsl_hypervisor: Correcting error handling path
PATCH v2 1/1 drivers/virt/fsl_hypervisor: Correcting error handling path
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.
This will address both.
---
v2:
Added review tag.
drivers/virt/fsl_hypervisor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/virt/fsl_hypervisor.c +2 -2
@@ -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])put_page (pages[i]); }
Signature · 1 line
1.9.1
Quoted 4 lines · Souptick Joarder
First, when memory allocation for
sg_list_unalignedfailed, there is no point of callingput_pages()as we haven't pinned any pages.
Quoted 8 lines
Second, if
get_user_pages_fast()failed we should unpinnednum_pinnedpages, no point of checking tillnum_pages.This will address both.
Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Dan Carpenter <[email protected]>Cc John Hubbard <[email protected]>
Any suggestion, what is the right tree to take this patch forward ?
Quoted 32 lines
---
v2:
Added review tag.drivers/virt/fsl_hypervisor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/virt/fsl_hypervisor.c +2
-3@@ -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])put_page (pages[i]); } --1.9.1
Quoted 9 lines · Souptick Joarder
Quoted 7 lines · Souptick Joarder
First, when memory allocation for
sg_list_unalignedfailed, there is no point of callingput_pages()as we haven't pinned any pages.Second, if
get_user_pages_fast()failed we should unpinnednum_pinnedpages, no point of checking tillnum_pages.
Quoted 7 lines
Quoted 5 lines
This will address both.
Signed-off-by Souptick Joarder <[email protected]>Reviewed-by Dan Carpenter <[email protected]>Cc John Hubbard <[email protected]>Any suggestion, what is the right tree to take this patch forward ?
If no further comment, can we get this patch in queue for 5.9 ?
Quoted 33 lines
Quoted 33 lines
---
v2:
Added review tag.drivers/virt/fsl_hypervisor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/virt/fsl_hypervisor.c +2
-3@@ -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])put_page (pages[i]); } --1.9.1