lib/test_hmm: fix memory leak in dmirror_migrate_to_system()
PATCH 1/1 lib/test_hmm: fix memory leak in dmirror_migrate_to_system()
Move the kvcalloc() calls after the early return checks to avoid leaking src_pfns and dst_pfns when end < start or mmget_not_zero() fails.
---
Sashiko report: https://sashiko.dev/#/patchset/[email protected]
It looks like the other issue reported by Sashiko (dmirror_devmem_fault() leaking args.src/args.dst on migrate_vma_setup() failure) may have already been addressed in mm-new by 84808b0e9f75 ("lib/test_hmm: fix error path in dmirror_devmem_fault()").
--- lib/test_hmm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
lib/test_hmm.c +3 -3
@@ -1111,9 +1111,6 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,unsigned long *src_pfns;unsigned long *dst_pfns; - src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); - dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); - start = cmd->addr; end = start + size;if (end < start)
@@ -1123,6 +1120,9 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,if (!mmget_not_zero (mm))return -EINVAL ; + src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); + dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); + cmd->cpages =0 ;mmap_read_lock (mm);for (addr = start; addr < end; addr = next) {
Signature · 1 line
2.25.1
On 2026-05-28 at 11:13 +1000, Hao Ge <[email protected]> wrote...
Quoted 3 lines
Move the
kvcalloc()calls after the early return checks to avoid leakingsrc_pfnsanddst_pfnswhen end < start ormmget_not_zero()fails.
Thanks.
Quoted 42 lines
Fixes 775465fd26a3 ("lib/test_hmm: add zone device private THP test infrastructure")Reported-by Sashiko <[email protected]>Signed-off-by Hao Ge <[email protected]>---
Sashiko report: https://sashiko.dev/#/patchset/[email protected]It looks like the other issue reported by Sashiko (
dmirror_devmem_fault()leaking args.src/args.dst onmigrate_vma_setup()failure) may have already been addressed in mm-new by84808b0e9f75("lib/test_hmm: fix error path indmirror_devmem_fault()").--- lib/test_hmm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)lib/test_hmm.c +3
-3@@ -1111,9 +1111,6 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,unsigned long *src_pfns;unsigned long *dst_pfns; - src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); - dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); - start = cmd->addr; end = start + size;if (end < start)@@ -1123,6 +1120,9 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,if (!mmget_not_zero (mm))return -EINVAL ; + src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); + dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); + cmd->cpages =0 ;mmap_read_lock (mm);for (addr = start; addr < end; addr = next) {Signature · 1 line
2.25.1
Balbir Singh
Reviewed-byQuoted 8 lines · Alistair Popple
On 2026-05-28 at 11:13 +1000, Hao Ge <[email protected]> wrote...
Quoted 3 lines
Move the
kvcalloc()calls after the early return checks to avoid leakingsrc_pfnsanddst_pfnswhen end < start ormmget_not_zero()fails.Thanks.
Reviewed-by Alistair Popple <[email protected]>
Thanks, might be late but
Quoted 43 lines
Quoted 43 lines
Fixes 775465fd26a3 ("lib/test_hmm: add zone device private THP test infrastructure")Reported-by Sashiko <[email protected]>Signed-off-by Hao Ge <[email protected]>---
Sashiko report: https://sashiko.dev/#/patchset/[email protected]It looks like the other issue reported by Sashiko (
dmirror_devmem_fault()leaking args.src/args.dst onmigrate_vma_setup()failure) may have already been addressed in mm-new by84808b0e9f75("lib/test_hmm: fix error path indmirror_devmem_fault()").--- lib/test_hmm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)lib/test_hmm.c +3
-3@@ -1111,9 +1111,6 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,unsigned long *src_pfns;unsigned long *dst_pfns; - src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); - dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); - start = cmd->addr; end = start + size;if (end < start)@@ -1123,6 +1120,9 @@ static int dmirror_migrate_to_system(struct dmirror *dmirror,if (!mmget_not_zero (mm))return -EINVAL ; + src_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*src_pfns),GFP_KERNEL | __GFP_NOFAIL); + dst_pfns =kvcalloc (PTRS_PER_PTE ,sizeof (*dst_pfns),GFP_KERNEL | __GFP_NOFAIL); + cmd->cpages =0 ;mmap_read_lock (mm);for (addr = start; addr < end; addr = next) {Signature · 1 line
2.25.1