From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 Aug 2021 23:59:09 +0000 (+1000)
Subject: mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c989419b81e353467dc489bb8185a075874862b;p=users%2Fjedix%2Flinux-maple.git

mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge-fix

simplify, cleanup

Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/mm/gup.c b/mm/gup.c
index 94f886562688..41fd86ec362c 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2247,14 +2247,13 @@ static int __gup_device_huge(unsigned long pfn, unsigned long addr,
 		pgmap = get_dev_pagemap(pfn, pgmap);
 		if (unlikely(!pgmap)) {
 			undo_dev_pagemap(nr, nr_start, flags, pages);
-			return 0;
+			break;
 		}
 		SetPageReferenced(page);
 		pages[*nr] = page;
 		if (unlikely(!try_grab_page(page, flags))) {
 			undo_dev_pagemap(nr, nr_start, flags, pages);
-			put_dev_pagemap(pgmap);
-			return 0;
+			break;
 		}
 		(*nr)++;
 		pfn++;