diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-11 14:19:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-11 14:19:20 -0700 |
| commit | 190bf7b14b0cf3df19c059061be032bd8994a597 (patch) | |
| tree | 7650ad54089040f7170aa6c4d6486973528f20bd /mm/ksm.c | |
| parent | 29d99aae13cf2713b85bc26a37921e231676ba48 (diff) | |
| parent | 5f1fc67f2cb8d3035d3acd273b48b97835af8afd (diff) | |
| download | net-190bf7b14b0cf3df19c059061be032bd8994a597.tar.gz | |
Merge tag 'mm-hotfixes-stable-2023-08-11-13-44' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton:
"14 hotfixes. 11 of these are cc:stable and the remainder address
post-6.4 issues, or are not considered suitable for -stable
backporting"
* tag 'mm-hotfixes-stable-2023-08-11-13-44' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mm/damon/core: initialize damo_filter->list from damos_new_filter()
nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput
selftests: cgroup: fix test_kmem_basic false positives
fs/proc/kcore: reinstate bounce buffer for KCORE_TEXT regions
MAINTAINERS: add maple tree mailing list
mm: compaction: fix endless looping over same migrate block
selftests: mm: ksm: fix incorrect evaluation of parameter
hugetlb: do not clear hugetlb dtor until allocating vmemmap
mm: memory-failure: avoid false hwpoison page mapped error info
mm: memory-failure: fix potential unexpected return value from unpoison_memory()
mm/swapfile: fix wrong swap entry type for hwpoisoned swapcache page
radix tree test suite: fix incorrect allocation size for pthreads
crypto, cifs: fix error handling in extract_iter_to_sg()
zsmalloc: fix races between modifications of fullness and isolated
Diffstat (limited to 'mm/ksm.c')
| -rw-r--r-- | mm/ksm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/ksm.c b/mm/ksm.c index ba266359da55f1..d20d7662419bea 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2784,6 +2784,8 @@ struct page *ksm_might_need_to_copy(struct page *page, anon_vma->root == vma->anon_vma->root) { return page; /* still no need to copy it */ } + if (PageHWPoison(page)) + return ERR_PTR(-EHWPOISON); if (!PageUptodate(page)) return page; /* let do_swap_page report the error */ |