The patch titled Subject: add-mmap_assert_locked-annotations-to-find_vma-fix has been removed from the -mm tree. Its filename was add-mmap_assert_locked-annotations-to-find_vma-fix.patch This patch was dropped because it was folded into add-mmap_assert_locked-annotations-to-find_vma.patch ------------------------------------------------------ From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Subject: add-mmap_assert_locked-annotations-to-find_vma-fix TOMOYO needs the same protection which get_arg_page() needs. Link: https://lkml.kernel.org/r/58bb6bf7-a57e-8a40-e74b-39584b415152@xxxxxxxxxxxxxxxxxxx Cc: Luigi Rizzo <lrizzo@xxxxxxxxxx> Cc: Kentaro Takeda <takedakn@xxxxxxxxxxxxx> Cc: James Morris <jmorris@xxxxxxxxx> Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- security/tomoyo/domain.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) --- a/security/tomoyo/domain.c~add-mmap_assert_locked-annotations-to-find_vma-fix +++ a/security/tomoyo/domain.c @@ -897,6 +897,9 @@ bool tomoyo_dump_page(struct linux_binpr struct tomoyo_page_dump *dump) { struct page *page; +#ifdef CONFIG_MMU + int ret; +#endif /* dump->data is released by tomoyo_find_next_domain(). */ if (!dump->data) { @@ -909,11 +912,13 @@ bool tomoyo_dump_page(struct linux_binpr /* * This is called at execve() time in order to dig around * in the argv/environment of the new proceess - * (represented by bprm). 'current' is the process doing - * the execve(). + * (represented by bprm). */ - if (get_user_pages_remote(bprm->mm, pos, 1, - FOLL_FORCE, &page, NULL, NULL) <= 0) + mmap_read_lock(bprm->mm); + ret = get_user_pages_remote(bprm->mm, pos, 1, + FOLL_FORCE, &page, NULL, NULL); + mmap_read_unlock(bprm->mm); + if (ret <= 0) return false; #else page = bprm->page[pos / PAGE_SIZE]; _ Patches currently in -mm which might be from penguin-kernel@xxxxxxxxxxxxxxxxxxx are add-mmap_assert_locked-annotations-to-find_vma.patch kernel-hung_taskc-monitor-killed-tasks.patch