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

Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of... 

Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "19 hotfixes. 14 are cc:stable and the remainder address issues which
  were introduced during this development cycle or which were considered
  inappropriate for a backport"

* tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  zswap: do not shrink if cgroup may not zswap
  page cache: fix page_cache_next/prev_miss off by one
  ocfs2: check new file size on fallocate call
  mailmap: add entry for John Keeping
  mm/damon/core: fix divide error in damon_nr_accesses_to_accesses_bp()
  epoll: ep_autoremove_wake_function should use list_del_init_careful
  mm/gup_test: fix ioctl fail for compat task
  nilfs2: reject devices with insufficient block count
  ocfs2: fix use-after-free when unmounting read-only filesystem
  lib/test_vmalloc.c: avoid garbage in page array
  nilfs2: fix possible out-of-bounds segment allocation in resize ioctl
  riscv/purgatory: remove PGO flags
  powerpc/purgatory: remove PGO flags
  x86/purgatory: remove PGO flags
  kexec: support purgatories with .text.hot sections
  mm/uffd: allow vma to merge as much as possible
  mm/uffd: fix vma operation where start addr cuts part of vma
  radix-tree: move declarations to header
  nilfs2: fix incomplete buffer cleanup in nilfs_btnode_abort_change_key()
parents fd37b884 0bdf0efa

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com> 
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 Keeping <john@keeping.me.uk> <john@metanate.com>

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

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>

arch/powerpc/purgatory/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ KCSAN_SANITIZE := n 


targets += trampoline_$(BITS).o purgatory.ro



# When profile-guided optimization is enabled, llvm emits two different

# overlapping text sections, which is not supported by kexec. Remove profile

# optimization flags.

KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS))



LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined



$(obj)/purgatory.ro: $(obj)/trampoline_$(BITS).o FORCE

arch/riscv/purgatory/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ CFLAGS_sha256.o := -D__DISABLE_EXPORTS 
CFLAGS_string.o := -D__DISABLE_EXPORTS

CFLAGS_ctype.o := -D__DISABLE_EXPORTS



# When profile-guided optimization is enabled, llvm emits two different

# overlapping text sections, which is not supported by kexec. Remove profile

# optimization flags.

KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS))



# When linking purgatory.ro with -r unresolved symbols are not checked,

# also link a purgatory.chk binary without -r to check for unresolved symbols.

PURGATORY_LDFLAGS := -e purgatory_start -z nodefaultlib

arch/x86/purgatory/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE 


CFLAGS_sha256.o := -D__DISABLE_EXPORTS



# When profile-guided optimization is enabled, llvm emits two different

# overlapping text sections, which is not supported by kexec. Remove profile

# optimization flags.

KBUILD_CFLAGS := $(filter-out -fprofile-sample-use=% -fprofile-use=%,$(KBUILD_CFLAGS))



# When linking purgatory.ro with -r unresolved symbols are not checked,

# also link a purgatory.chk binary without -r to check for unresolved symbols.

PURGATORY_LDFLAGS := -e purgatory_start -z nodefaultlib

fs/eventpoll.c

+5 −1
Original line number Diff line number Diff line
@@ -1805,7 +1805,11 @@ static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, 
{

	int ret = default_wake_function(wq_entry, mode, sync, key);



	list_del_init(&wq_entry->entry);

	/*

	 * Pairs with list_empty_careful in ep_poll, and ensures future loop

	 * iterations see the cause of this wakeup.

	 */

	list_del_init_careful(&wq_entry->entry);

	return ret;

}