Commit 18bf3408 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  tools/vm: fix cross-compile build
  coredump: fix null pointer dereference on coredump
  mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
  shmem: fix possible deadlocks on shmlock_user_lock
  vmalloc: fix remap_vmalloc_range() bounds checks
  mm/shmem: fix build without THP
  mm/ksm: fix NULL pointer dereference when KSM zero page is enabled
  tools/build: tweak unused value workaround
  checkpatch: fix a typo in the regex for $allocFunctions
  mm, gup: return EINTR when gup is interrupted by fatal signals
  mm/hugetlb: fix a addressing exception caused by huge_pte_offset
  MAINTAINERS: add an entry for kfifo
  mm/userfaultfd: disable userfaultfd-wp on x86_32
  slub: avoid redzone when choosing freepointer location
  sh: fix build error in mm/init.c
parents 8160a563 cf01699e

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -9417,6 +9417,13 @@ F: include/linux/keyctl.h 
F:	include/uapi/linux/keyctl.h

F:	security/keys/









KFIFO









M:	Stefani Seibold <stefani@seibold.net>









S:	Maintained









F:	include/linux/kfifo.h









F:	lib/kfifo.c









F:	samples/kfifo/

















KGDB / KDB /debug_core









M:	Jason Wessel <jason.wessel@windriver.com>









M:	Daniel Thompson <daniel.thompson@linaro.org>
































arch/sh/mm/init.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -412,7 +412,7 @@ int arch_add_memory(int nid, u64 start, u64 size,







	unsigned long nr_pages = size >> PAGE_SHIFT;









	int ret;



















	if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot)









	if (WARN_ON_ONCE(params->pgprot.pgprot != PAGE_KERNEL.pgprot))









		return -EINVAL;



















	/* We only have ZONE_NORMAL, so this is easy.. */
































arch/x86/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -149,7 +149,7 @@ config X86







	select HAVE_ARCH_TRACEHOOK









	select HAVE_ARCH_TRANSPARENT_HUGEPAGE









	select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64









	select HAVE_ARCH_USERFAULTFD_WP		if USERFAULTFD









	select HAVE_ARCH_USERFAULTFD_WP         if X86_64 && USERFAULTFD









	select HAVE_ARCH_VMAP_STACK		if X86_64









	select HAVE_ARCH_WITHIN_STACK_FRAMES









	select HAVE_ASM_MODVERSIONS
































fs/coredump.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -211,6 +211,8 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm,







			return -ENOMEM;









		(*argv)[(*argc)++] = 0;









		++pat_ptr;









		if (!(*pat_ptr))









			return -ENOMEM;









	}



















	/* Repeat as long as we have more pattern to process and more output
































fs/proc/vmcore.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -266,7 +266,8 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst,







		if (start < offset + dump->size) {









			tsz = min(offset + (u64)dump->size - start, (u64)size);









			buf = dump->buf + start - offset;









			if (remap_vmalloc_range_partial(vma, dst, buf, tsz)) {









			if (remap_vmalloc_range_partial(vma, dst, buf, 0,









							tsz)) {









				ret = -EFAULT;









				goto out_unlock;









			}








@@ -624,7 +625,7 @@ static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)







		tsz = min(elfcorebuf_sz + elfnotes_sz - (size_t)start, size);









		kaddr = elfnotes_buf + start - elfcorebuf_sz - vmcoredd_orig_sz;









		if (remap_vmalloc_range_partial(vma, vma->vm_start + len,









						kaddr, tsz))









						kaddr, 0, tsz))









			goto fail;



















		size -= tsz;








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE