The patch titled
Subject: add-mmap_assert_locked-annotations-to-find_vma-fix
has been added to the -mm tree. Its filename is
add-mmap_assert_locked-annotations-to-find_vma-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/add-mmap_assert_locked-annotations-to-find_vma-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/add-mmap_assert_locked-annotations-to-find_vma-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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-fix.patch
kernel-hung_taskc-monitor-killed-tasks.patch
