From: Liam Howlett <liam.howlett@oracle.com>
To: Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Liam Howlett <liam.howlett@oracle.com>,
"linux-alpha@vger.kernel.org" <linux-alpha@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Michel Lespinasse <walken@google.com>,
"Gustavo A . R . Silva" <gustavoars@kernel.org>
Subject: [PATCH] alpha/kernel/traps: Use find_vma_intersection() in traps for setting si_code
Date: Thu, 1 Apr 2021 19:51:48 +0000 [thread overview]
Message-ID: <20210401195138.2895285-1-Liam.Howlett@Oracle.com> (raw)
find_vma() will continue to search upwards until the end of the virtual
memory space. This means the si_code would almost never be set to
SEGV_MAPERR even when the address falls outside of any VMA.
Using find_vma_intersection() allows for what is intended by only
returning a VMA if it falls within the range provided, in this case a
window of 1.
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
arch/alpha/kernel/traps.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 921d4b6e4d95..7f51386c06d0 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -957,8 +957,10 @@ do_entUnaUser(void __user * va, unsigned long opcode,
si_code = SEGV_ACCERR;
else {
struct mm_struct *mm = current->mm;
+ unsigned long addr = (unsigned long)va;
+
mmap_read_lock(mm);
- if (find_vma(mm, (unsigned long)va))
+ if (find_vma_intersection(mm, addr, addr + 1))
si_code = SEGV_ACCERR;
else
si_code = SEGV_MAPERR;
--
2.30.0
next reply other threads:[~2021-04-01 19:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 19:51 Liam Howlett [this message]
2021-04-01 20:25 ` [PATCH] alpha/kernel/traps: Use find_vma_intersection() in traps for setting si_code Michel Lespinasse
2021-04-02 13:05 ` Liam Howlett
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=20210401195138.2895285-1-Liam.Howlett@Oracle.com \
--to=liam.howlett@oracle.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=gustavoars@kernel.org \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=rth@twiddle.net \
--cc=walken@google.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