From: Jann Horn <jannh@google.com>
To: Nick Hu <nickhu@andestech.com>, Greentime Hu <green.hu@gmail.com>,
Vincent Chen <deanbo422@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH] nds32: Take mmap lock in cacheflush syscall
Date: Fri, 25 Sep 2020 15:57:48 -0700 [thread overview]
Message-ID: <CAG48ez1UnQEMok9rqFQC4XHBaMmBe=eaedu8Z_RXdjFHTna_LA@mail.gmail.com> (raw)
We need to take the mmap lock around find_vma() and subsequent use of the
VMA. Otherwise, we can race with concurrent operations like munmap(), which
can lead to use-after-free accesses to freed VMAs.
Fixes: 1932fbe36e02 ("nds32: System calls handling")
Signed-off-by: Jann Horn <jannh@google.com>
---
To the maintainers:
I can't easily test this patch - I don't even have an nds32 compiler.
If you have tested this patch, you may want to add a CC stable tag to this.
arch/nds32/kernel/sys_nds32.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/arch/nds32/kernel/sys_nds32.c b/arch/nds32/kernel/sys_nds32.c
index cb2d1e219bb3..836deecea83d 100644
--- a/arch/nds32/kernel/sys_nds32.c
+++ b/arch/nds32/kernel/sys_nds32.c
@@ -28,12 +28,18 @@ SYSCALL_DEFINE4(fadvise64_64_wrapper,int, fd, int,
advice, loff_t, offset,
SYSCALL_DEFINE3(cacheflush, unsigned int, start, unsigned int, end, int, cache)
{
+ struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
bool flushi = true, wbd = true;
+ int ret;
- vma = find_vma(current->mm, start);
- if (!vma)
- return -EFAULT;
+ if (mmap_read_lock_killable(mm))
+ return -EINTR;
+ vma = find_vma(mm, start);
+ if (!vma) {
+ ret = -EFAULT;
+ goto out;
+ }
switch (cache) {
case ICACHE:
wbd = false;
@@ -44,11 +50,15 @@ SYSCALL_DEFINE3(cacheflush, unsigned int, start,
unsigned int, end, int, cache)
case BCACHE:
break;
default:
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
cpu_cache_wbinval_range_check(vma, start, end, flushi, wbd);
+ ret = 0;
- return 0;
+out:
+ mmap_read_unlock(mm);
+ return ret;
}
SYSCALL_DEFINE2(fp_udfiex_crtl, unsigned int, cmd, unsigned int, act)
base-commit: 6d28cf7dfede6cfca5119a0d415a6a447c68f3a0
--
2.28.0.681.g6f77f65b4e-goog
reply other threads:[~2020-09-25 22:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAG48ez1UnQEMok9rqFQC4XHBaMmBe=eaedu8Z_RXdjFHTna_LA@mail.gmail.com' \
--to=jannh@google.com \
--cc=deanbo422@gmail.com \
--cc=green.hu@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nickhu@andestech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox