From: Andrii Nakryiko <andrii@kernel.org>
To: linux-trace-kernel@vger.kernel.org, rostedt@goodmis.org,
mhiramat@kernel.org, oleg@redhat.com
Cc: peterz@infradead.org, mingo@redhat.com, bpf@vger.kernel.org,
jolsa@kernel.org, paulmck@kernel.org, clm@meta.com,
Andrii Nakryiko <andrii@kernel.org>
Subject: [PATCH 02/12] uprobes: grab write mmap lock in unapply_uprobe()
Date: Mon, 24 Jun 2024 17:21:34 -0700 [thread overview]
Message-ID: <20240625002144.3485799-3-andrii@kernel.org> (raw)
In-Reply-To: <20240625002144.3485799-1-andrii@kernel.org>
Given unapply_uprobe() can call remove_breakpoint() which eventually
calls uprobe_write_opcode(), which can modify a set of memory pages and
expects mm->mmap_lock held for write, it needs to have writer lock.
Fix this by switching to mmap_write_lock()/mmap_write_unlock().
Fixes: da1816b1caec ("uprobes: Teach handler_chain() to filter out the probed task")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
kernel/events/uprobes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 197fbe4663b5..e896eeecb091 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -1235,7 +1235,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
struct vm_area_struct *vma;
int err = 0;
- mmap_read_lock(mm);
+ mmap_write_lock(mm);
for_each_vma(vmi, vma) {
unsigned long vaddr;
loff_t offset;
@@ -1252,7 +1252,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
vaddr = offset_to_vaddr(vma, uprobe->offset);
err |= remove_breakpoint(uprobe, mm, vaddr);
}
- mmap_read_unlock(mm);
+ mmap_write_unlock(mm);
return err;
}
--
2.43.0
next prev parent reply other threads:[~2024-06-25 0:21 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-25 0:21 [PATCH 00/12] uprobes: add batched register/unregister APIs and per-CPU RW semaphore Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 01/12] uprobes: update outdated comment Andrii Nakryiko
2024-06-25 0:21 ` Andrii Nakryiko [this message]
2024-06-25 1:29 ` [PATCH 02/12] uprobes: grab write mmap lock in unapply_uprobe() Masami Hiramatsu
2024-06-25 14:49 ` Oleg Nesterov
2024-06-25 17:37 ` Andrii Nakryiko
2024-06-25 19:07 ` Oleg Nesterov
2024-06-26 16:38 ` Andrii Nakryiko
2024-06-25 10:50 ` Oleg Nesterov
2024-06-25 0:21 ` [PATCH 03/12] uprobes: simplify error handling for alloc_uprobe() Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 04/12] uprobes: revamp uprobe refcounting and lifetime management Andrii Nakryiko
2024-06-25 14:44 ` Oleg Nesterov
2024-06-25 17:30 ` Andrii Nakryiko
2024-06-26 6:02 ` kernel test robot
2024-06-26 16:39 ` Andrii Nakryiko
2024-06-27 2:29 ` Masami Hiramatsu
2024-06-27 16:43 ` Andrii Nakryiko
2024-07-01 21:59 ` Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 05/12] uprobes: move offset and ref_ctr_offset into uprobe_consumer Andrii Nakryiko
2024-06-27 3:06 ` Masami Hiramatsu
2024-06-25 0:21 ` [PATCH 06/12] uprobes: add batch uprobe register/unregister APIs Andrii Nakryiko
2024-06-26 11:27 ` Jiri Olsa
2024-06-26 16:44 ` Andrii Nakryiko
2024-06-27 13:04 ` Masami Hiramatsu
2024-06-27 16:47 ` Andrii Nakryiko
2024-06-28 6:28 ` Masami Hiramatsu
2024-06-28 16:34 ` Andrii Nakryiko
2024-06-29 23:30 ` Masami Hiramatsu
2024-07-01 17:55 ` Andrii Nakryiko
2024-07-01 22:15 ` Andrii Nakryiko
2024-07-02 1:01 ` Masami Hiramatsu
2024-07-02 1:34 ` Andrii Nakryiko
2024-07-02 15:19 ` Masami Hiramatsu
2024-07-02 16:53 ` Steven Rostedt
2024-07-02 21:23 ` Andrii Nakryiko
2024-07-02 23:16 ` Masami Hiramatsu
2024-06-25 0:21 ` [PATCH 07/12] uprobes: inline alloc_uprobe() logic into __uprobe_register() Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 08/12] uprobes: split uprobe allocation and uprobes_tree insertion steps Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 09/12] uprobes: batch uprobes_treelock during registration Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 10/12] uprobes: improve lock batching for uprobe_unregister_batch Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 11/12] uprobes,bpf: switch to batch uprobe APIs for BPF multi-uprobes Andrii Nakryiko
2024-06-25 0:21 ` [PATCH 12/12] uprobes: switch uprobes_treelock to per-CPU RW semaphore Andrii Nakryiko
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=20240625002144.3485799-3-andrii@kernel.org \
--to=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=clm@meta.com \
--cc=jolsa@kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/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;
as well as URLs for NNTP newsgroup(s).