mm-hwpoison-fix-potential-pte_unmap_unlock-pte-error.patch removed from -mm tree
The patch titled
Subject: mm/hwpoison: fix potential pte_unmap_unlock pte error
has been removed from the -mm tree. Its filename was
mm-hwpoison-fix-potential-pte_unmap_unlock-pte-error.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Miaohe Lin <[email protected]>
Subject: mm/hwpoison: fix potential pte_unmap_unlock pte error
If the first pte is equal to poisoned_pfn, i.e. check_hwpoisoned_entry() return 1, the wrong ptep - 1 would be passed to pte_unmap_unlock().
---
mm/memory-failure.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
mm/memory-failure.c renamed from mm/memory-failure.c~mm-hwpoison-fix-potential-pte_unmap_unlock-pte-error +4 -3
@@ -632,7 +632,7 @@ static int hwpoison_pte_range(pmd_t *pmd {struct hwp_walk *hwp = (struct hwp_walk *)walk->private;int ret =0 ; -pte_t *ptep; +pte_t *ptep, *mapped_pte;spinlock_t *ptl; ptl =pmd_trans_huge_lock (pmdp, walk->vma);
@@ -645,14 +645,15 @@ static int hwpoison_pte_range(pmd_t *pmdif (pmd_trans_unstable (pmdp)) goto out; - ptep =pte_offset_map_lock (walk->vma->vm_mm, pmdp, addr, &ptl); + mapped_pte = ptep =pte_offset_map_lock (walk->vma->vm_mm, pmdp, + addr, &ptl);for (; addr != end; ptep++, addr +=PAGE_SIZE ) { ret =check_hwpoisoned_entry (*ptep, addr,PAGE_SHIFT , hwp->pfn, &hwp->tk);if (ret ==1 )break ; } -pte_unmap_unlock (ptep -1 , ptl); +pte_unmap_unlock (mapped_pte, ptl); out:cond_resched ();return ret;
_
Patches currently in -mm which might be from [email protected] are
mm-page_allocc-avoid-accessing-uninitialized-pcp-page-migratetype.patch mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code.patch mm-memory_hotplug-make-hwpoisoned-dirty-swapcache-pages-unmovable.patch mm-zsmallocc-close-race-window-between-zs_pool_dec_isolated-and-zs_unregister_migration.patch mm-zsmallocc-combine-two-atomic-ops-in-zs_pool_dec_isolated.patch