Unverified Commit c13b216d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6746 v3 openEuler-1.0-LTS: bugfix for mm 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wupeng Ma <mawupeng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N62FRQOQBXML5VV326SHZX7GQKFPVVSI/ 
From: Ma Wupeng <mawupeng1@huawei.com>

mm/madvise: fix potential pte_unmap_unlock pte error.

Changelog since v2:
- fix style problem.

Miaohe Lin (1):
  mm/madvise: fix potential pte_unmap_unlock pte error


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I9K8XT 
 
Link:https://gitee.com/openeuler/kernel/pulls/6746

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 2f2cecd5 abbe11e7

mm/madvise.c

+2 −2
Original line number Diff line number Diff line
@@ -391,12 +391,12 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, 
			if (split_huge_page(page)) {

				unlock_page(page);

				put_page(page);

				pte_offset_map_lock(mm, pmd, addr, &ptl);

				orig_pte = pte_offset_map_lock(mm, pmd, addr, &ptl);

				goto out;

			}

			unlock_page(page);

			put_page(page);

			pte = pte_offset_map_lock(mm, pmd, addr, &ptl);

			orig_pte = pte = pte_offset_map_lock(mm, pmd, addr, &ptl);

			pte--;

			addr -= PAGE_SIZE;

			continue;