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

From: Souptick Joarder <jrdr.linux@gmail.com>
To: akpm@linux-foundation.org, dan.carpenter@oracle.com,
	jgg@ziepe.ca, dsterba@suse.com, arnd@arndb.de,
	ira.weiny@intel.com
Cc: linux-kernel@vger.kernel.org, Souptick Joarder <jrdr.linux@gmail.com>
Subject: [PATCH] drivers/virt/fsl_hypervisor: Correcting error handling path
Date: Thu, 14 May 2020 01:53:16 +0530	[thread overview]
Message-ID: <1589401396-31210-1-git-send-email-jrdr.linux@gmail.com> (raw)

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.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
 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])
 				put_page(pages[i]);
 	}
-- 
1.9.1

