From 8543d228388f841f520db91ab334e8f6ee303caf Mon Sep 17 00:00:00 2001
From: Ma Wupeng <mawupeng1@huawei.com>
Date: Sun, 6 Mar 2022 15:44:55 +0800
Subject: [PATCH] mm: Fix return val in khugepaged_scan_pmd()

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4SK3S
CVE: NA

------------------------------------------

The khugepaged_scan_pmd() should return 0 not SCAN_ALLOC_HUGE_PAGE_FAIL,
or mmap_sem will not be released in khugepaged_scan_mm_slot().

Fixes: 1845e7add957 ("mm: Add reliable memory use limit for user tasks")
Signed-off-by: Ma Wupeng <mawupeng1@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: Wei Li <liwei391@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/khugepaged.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index c9be18c669a1..301d6aa079d7 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1240,7 +1240,8 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
 				if (reliable_allow_fb_enabled()) {
 					reliable = false;
 				} else {
-					ret = SCAN_ALLOC_HUGE_PAGE_FAIL;
+					result = SCAN_ALLOC_HUGE_PAGE_FAIL;
+					ret = 0;
 					goto out;
 				}
 			}
-- 
GitLab