From 6881cad75ddf609a5e837ffd7120f8b39d259dbd Mon Sep 17 00:00:00 2001 From: Wei Yang Date: Tue, 22 Sep 2020 10:22:57 +0800 Subject: [PATCH] mm/huge_memory.c: use head to check huge zero page mainline inclusion from mainline-5.6-rc1 commit cb829624867b5ab10bc6a7036d183b1b82bfe9f8 category: bugfix bugzilla: 29957 CVE: NA ------------------------------------------------- The page could be a tail page, if this is the case, this BUG_ON will never be triggered. Link: http://lkml.kernel.org/r/20200110032610.26499-1-richardw.yang@linux.intel.com Fixes: e9b61f19858a ("thp: reintroduce split_huge_page()") Signed-off-by: Wei Yang Acked-by: Kirill A. Shutemov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit cb829624867b5ab10bc6a7036d183b1b82bfe9f8) Signed-off-by: Kefeng Wang Reviewed-by: Jing Xiangfeng Signed-off-by: Yang Yingliang --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 438cdd2af367..cdceef783141 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2661,7 +2661,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) unsigned long flags; pgoff_t end; - VM_BUG_ON_PAGE(is_huge_zero_page(page), page); + VM_BUG_ON_PAGE(is_huge_zero_page(head), head); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageCompound(page), page); -- GitLab