Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mailmap: update Mark Yao's email address
  userfaultfd: clear the vma->vm_userfaultfd_ctx if UFFD_EVENT_FORK fails
  mm/sparse.c: wrong allocation for mem_section
  mm/zsmalloc.c: include fs.h
  mm/debug.c: provide useful debugging information for VM_BUG
  kernel/exit.c: export abort() to modules
  mm/mprotect: add a cond_resched() inside change_pmd_range()
  kernel/acct.c: fix the acct->needcheck check in check_free_space()
  mm: check pfn_valid first in zero_resv_unavail
parents 5866bec2 9a0e7120

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> 
Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthieu CASTET <castet.matthieu@free.fr>

arch/arm/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ void abort(void) 
	/* if that doesn't kill us, halt */

	panic("Oops failed to kill thread");

}

EXPORT_SYMBOL(abort);



void __init trap_init(void)

{

arch/m32r/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ void abort(void) 
	/* if that doesn't kill us, halt */

	panic("Oops failed to kill thread");

}

EXPORT_SYMBOL(abort);



void __init trap_init(void)

{

arch/unicore32/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ void abort(void) 
	/* if that doesn't kill us, halt */

	panic("Oops failed to kill thread");

}

EXPORT_SYMBOL(abort);



void __init trap_init(void)

{

fs/userfaultfd.c

+18 −2
Original line number Diff line number Diff line
@@ -570,11 +570,14 @@ int handle_userfault(struct vm_fault *vmf, unsigned long reason) 
static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,

					      struct userfaultfd_wait_queue *ewq)

{

	struct userfaultfd_ctx *release_new_ctx;



	if (WARN_ON_ONCE(current->flags & PF_EXITING))

		goto out;



	ewq->ctx = ctx;

	init_waitqueue_entry(&ewq->wq, current);

	release_new_ctx = NULL;



	spin_lock(&ctx->event_wqh.lock);

	/*
@@ -601,8 +604,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx, 
				new = (struct userfaultfd_ctx *)

					(unsigned long)

					ewq->msg.arg.reserved.reserved1;



				userfaultfd_ctx_put(new);

				release_new_ctx = new;

			}

			break;

		}
@@ -617,6 +619,20 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx, 
	__set_current_state(TASK_RUNNING);

	spin_unlock(&ctx->event_wqh.lock);



	if (release_new_ctx) {

		struct vm_area_struct *vma;

		struct mm_struct *mm = release_new_ctx->mm;



		/* the various vma->vm_userfaultfd_ctx still points to it */

		down_write(&mm->mmap_sem);

		for (vma = mm->mmap; vma; vma = vma->vm_next)

			if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx)

				vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;

		up_write(&mm->mmap_sem);



		userfaultfd_ctx_put(release_new_ctx);

	}



	/*

	 * ctx may go away after this if the userfault pseudo fd is

	 * already released.