This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/12.3
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 2603ddd01b17778d45dbe5a4fb6ad2e782c90170
Author: Ville Juven <ville.ju...@unikie.com>
AuthorDate: Wed Oct 4 15:58:15 2023 +0300
kmm_map.c: Remember to free the temporary 'pages' variable
The temp variable was freed only in error cases, but it needs to be freed
in the happy case as well.
---
mm/kmap/kmm_map.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mm/kmap/kmm_map.c b/mm/kmap/kmm_map.c
index 1deb0f25ce..ca94fe3bf0 100644
--- a/mm/kmap/kmm_map.c
+++ b/mm/kmap/kmm_map.c
@@ -377,7 +377,7 @@ void kmm_unmap(FAR void *kaddr)
FAR void *kmm_map_user(FAR void *uaddr, size_t size)
{
- FAR void *pages;
+ FAR void **pages;
uintptr_t vaddr;
uintptr_t offset;
size_t npages;
@@ -414,7 +414,7 @@ FAR void *kmm_map_user(FAR void *uaddr, size_t size)
/* No, the area must be mapped into kernel virtual address space */
- pages = kmm_zalloc(npages * sizeof(FAR void *));
+ pages = (FAR void **)kmm_zalloc(npages * sizeof(FAR void *));
if (!pages)
{
return NULL;
@@ -422,7 +422,7 @@ FAR void *kmm_map_user(FAR void *uaddr, size_t size)
/* Fetch the physical pages for the user virtual address range */
- ret = get_user_pages(&pages, npages, vaddr);
+ ret = get_user_pages(pages, npages, vaddr);
if (ret < 0)
{
goto errout_with_pages;
@@ -430,7 +430,7 @@ FAR void *kmm_map_user(FAR void *uaddr, size_t size)
/* Map the physical pages to kernel memory */
- vaddr = (uintptr_t)map_pages(&pages, npages, PROT_READ | PROT_WRITE);
+ vaddr = (uintptr_t)map_pages(pages, npages, PROT_READ | PROT_WRITE);
if (!vaddr)
{
goto errout_with_pages;
@@ -438,6 +438,7 @@ FAR void *kmm_map_user(FAR void *uaddr, size_t size)
/* Ok, we have a virtual memory area, add the offset back */
+ kmm_free(pages);
return (FAR void *)(vaddr + offset);
errout_with_pages:
