* [folded-merged] add-mmap_assert_locked-annotations-to-find_vma-fix.patch removed from -mm tree
@ 2021-09-02 21:17 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-09-02 21:17 UTC (permalink / raw)
To: jmorris, lrizzo, mm-commits, penguin-kernel, serge, sfr, takedakn
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@i-love.sakura.ne.jp>
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@i-love.sakura.ne.jp
Cc: Luigi Rizzo <lrizzo@google.com>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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@i-love.sakura.ne.jp are
add-mmap_assert_locked-annotations-to-find_vma.patch
kernel-hung_taskc-monitor-killed-tasks.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-02 21:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-02 21:17 [folded-merged] add-mmap_assert_locked-annotations-to-find_vma-fix.patch removed from -mm tree akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).