Commit c22c3e07 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-05-10-13-14' of... 

Merge tag 'mm-hotfixes-stable-2024-05-10-13-14' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull MM fixes from Andrew Morton:
 "18 hotfixes, 7 of which are cc:stable.

  More fixups for this cycle's page_owner updates. And a few userfaultfd
  fixes. Otherwise, random singletons - see the individual changelogs
  for details"

* tag 'mm-hotfixes-stable-2024-05-10-13-14' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mailmap: add entry for Barry Song
  selftests/mm: fix powerpc ARCH check
  mailmap: add entry for John Garry
  XArray: set the marks correctly when splitting an entry
  selftests/vDSO: fix runtime errors on LoongArch
  selftests/vDSO: fix building errors on LoongArch
  mm,page_owner: don't remove __GFP_NOLOCKDEP in add_stack_record_to_list
  fs/proc/task_mmu: fix uffd-wp confusion in pagemap_scan_pmd_entry()
  fs/proc/task_mmu: fix loss of young/dirty bits during pagemap scan
  mm/vmalloc: fix return value of vb_alloc if size is 0
  mm: use memalloc_nofs_save() in page_cache_ra_order()
  kmsan: compiler_types: declare __no_sanitize_or_inline
  lib/test_xarray.c: fix error assumptions on check_xa_multi_store_adv_add()
  tools: fix userspace compilation with new test_xarray changes
  MAINTAINERS: update URL's for KEYS/KEYRINGS_INTEGRITY and TPM DEVICE DRIVER
  mm: page_owner: fix wrong information in dump_page_owner
  maple_tree: fix mas_empty_area_rev() null pointer dereference
  mm/userfaultfd: reset ptes when close() for wr-protected ones
parents cfb4be1a 672614a3

.mailmap

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Barry Song <baohua@kernel.org> <21cnbao@gmail.com>

Barry Song <baohua@kernel.org> <v-songbaohua@oppo.com>

Barry Song <baohua@kernel.org> <song.bao.hua@hisilicon.com>

Barry Song <baohua@kernel.org> <Baohua.Song@csr.com>

Barry Song <baohua@kernel.org> <barry.song@analog.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
@@ -304,6 +309,7 @@ Johan Hovold <johan@kernel.org> <jhovold@gmail.com> 
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Garry <john.g.garry@oracle.com> <john.garry@huawei.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -12041,6 +12041,7 @@ M: Mimi Zohar <zohar@linux.ibm.com> 
L:	linux-integrity@vger.kernel.org

L:	keyrings@vger.kernel.org

S:	Supported

W:	https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity

F:	security/integrity/platform_certs









KFENCE








@@ -22409,7 +22410,7 @@ M:	Jarkko Sakkinen <jarkko@kernel.org>







R:	Jason Gunthorpe <jgg@ziepe.ca>









L:	linux-integrity@vger.kernel.org









S:	Maintained









W:	https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity









W:	https://gitlab.com/jarkkojs/linux-tpmdd-test









Q:	https://patchwork.kernel.org/project/linux-integrity/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git









F:	Documentation/devicetree/bindings/tpm/

























fs/proc/task_mmu.c



+14
−10






























Original line number
Diff line number
Diff line







@@ -1817,15 +1817,13 @@ static unsigned long pagemap_page_category(struct pagemap_scan_private *p,







}



















static void make_uffd_wp_pte(struct vm_area_struct *vma,









			     unsigned long addr, pte_t *pte)









			     unsigned long addr, pte_t *pte, pte_t ptent)









{









	pte_t ptent = ptep_get(pte);



















	if (pte_present(ptent)) {









		pte_t old_pte;



















		old_pte = ptep_modify_prot_start(vma, addr, pte);









		ptent = pte_mkuffd_wp(ptent);









		ptent = pte_mkuffd_wp(old_pte);









		ptep_modify_prot_commit(vma, addr, pte, old_pte, ptent);









	} else if (is_swap_pte(ptent)) {









		ptent = pte_swp_mkuffd_wp(ptent);








@@ -2175,9 +2173,12 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,







	if ((p->arg.flags & PM_SCAN_WP_MATCHING) && !p->vec_out) {









		/* Fast path for performing exclusive WP */









		for (addr = start; addr != end; pte++, addr += PAGE_SIZE) {









			if (pte_uffd_wp(ptep_get(pte)))









			pte_t ptent = ptep_get(pte);



















			if ((pte_present(ptent) && pte_uffd_wp(ptent)) ||









			    pte_swp_uffd_wp_any(ptent))









				continue;









			make_uffd_wp_pte(vma, addr, pte);









			make_uffd_wp_pte(vma, addr, pte, ptent);









			if (!flush_end)









				start = addr;









			flush_end = addr + PAGE_SIZE;








@@ -2190,8 +2191,10 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,







	    p->arg.return_mask == PAGE_IS_WRITTEN) {









		for (addr = start; addr < end; pte++, addr += PAGE_SIZE) {









			unsigned long next = addr + PAGE_SIZE;









			pte_t ptent = ptep_get(pte);



















			if (pte_uffd_wp(ptep_get(pte)))









			if ((pte_present(ptent) && pte_uffd_wp(ptent)) ||









			    pte_swp_uffd_wp_any(ptent))









				continue;









			ret = pagemap_scan_output(p->cur_vma_category | PAGE_IS_WRITTEN,









						  p, addr, &next);








@@ -2199,7 +2202,7 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,







				break;









			if (~p->arg.flags & PM_SCAN_WP_MATCHING)









				continue;









			make_uffd_wp_pte(vma, addr, pte);









			make_uffd_wp_pte(vma, addr, pte, ptent);









			if (!flush_end)









				start = addr;









			flush_end = next;








@@ -2208,8 +2211,9 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,







	}



















	for (addr = start; addr != end; pte++, addr += PAGE_SIZE) {









		pte_t ptent = ptep_get(pte);









		unsigned long categories = p->cur_vma_category |









					   pagemap_page_category(p, vma, addr, ptep_get(pte));









					   pagemap_page_category(p, vma, addr, ptent);









		unsigned long next = addr + PAGE_SIZE;



















		if (!pagemap_scan_is_interesting_page(categories, p))








@@ -2224,7 +2228,7 @@ static int pagemap_scan_pmd_entry(pmd_t *pmd, unsigned long start,







		if (~categories & PAGE_IS_WRITTEN)









			continue;



















		make_uffd_wp_pte(vma, addr, pte);









		make_uffd_wp_pte(vma, addr, pte, ptent);









		if (!flush_end)









			start = addr;









		flush_end = next;
































fs/userfaultfd.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -895,6 +895,10 @@ static int userfaultfd_release(struct inode *inode, struct file *file)







			prev = vma;









			continue;









		}









		/* Reset ptes for the whole vma range if wr-protected */









		if (userfaultfd_wp(vma))









			uffd_wp_range(vma, vma->vm_start,









				      vma->vm_end - vma->vm_start, false);









		new_flags = vma->vm_flags & ~__VM_UFFD_FLAGS;









		vma = vma_modify_flags_uffd(&vmi, prev, vma, vma->vm_start,









					    vma->vm_end, new_flags,
































include/linux/compiler_types.h



+11
−0






























Original line number
Diff line number
Diff line







@@ -278,6 +278,17 @@ struct ftrace_likely_data {







# define __no_kcsan









#endif



















#ifdef __SANITIZE_MEMORY__









/*









 * Similarly to KASAN and KCSAN, KMSAN loses function attributes of inlined









 * functions, therefore disabling KMSAN checks also requires disabling inlining.









 *









 * __no_sanitize_or_inline effectively prevents KMSAN from reporting errors









 * within the function and marks all its outputs as initialized.









 */









# define __no_sanitize_or_inline __no_kmsan_checks notrace __maybe_unused









#endif



















#ifndef __no_sanitize_or_inline









#define __no_sanitize_or_inline __always_inline









#endif