summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2022-05-31 20:26:43 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-09 10:23:28 +0200
commitfd9a5081ee3311a3ceee9f0f3ddbf508e119b580 (patch)
tree19427284f5213ef3a894e1ea7e01632317367e7c /mm
parent715455ca5e81cc28ee3d606cce5c223e26b5ad24 (diff)
downloadlinux-fd9a5081ee3311a3ceee9f0f3ddbf508e119b580.tar.gz
linux-fd9a5081ee3311a3ceee9f0f3ddbf508e119b580.tar.bz2
linux-fd9a5081ee3311a3ceee9f0f3ddbf508e119b580.zip
mm/memremap: fix missing call to untrack_pfn() in pagemap_range()
commit a04e1928e2ead144dc2f369768bc0a0f3110af89 upstream. We forget to call untrack_pfn() to pair with track_pfn_remap() when range is not allowed to hotplug. Fix it by jump err_kasan. Link: https://lkml.kernel.org/r/20220531122643.25249-1-linmiaohe@huawei.com Fixes: bca3feaa0764 ("mm/memory_hotplug: prevalidate the address range being added with platform") Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: Muchun Song <songmuchun@bytedance.com> Cc: Anshuman Khandual <anshuman.khandual@arm.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memremap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memremap.c b/mm/memremap.c
index ed593bf87109..e77487375c8e 100644
--- a/mm/memremap.c
+++ b/mm/memremap.c
@@ -245,7 +245,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params,
if (!mhp_range_allowed(range->start, range_len(range), !is_private)) {
error = -EINVAL;
- goto err_pfn_remap;
+ goto err_kasan;
}
mem_hotplug_begin();