diff options
author | Oleg Nesterov <oleg@redhat.com> | 2012-09-16 11:20:06 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2012-09-29 15:21:53 -0400 |
commit | 75ed82ea53bd0d2d8083261123576250f7ba851e (patch) | |
tree | da2c69d053b7555c15e1adb5e6d901c2afab8ad8 /kernel | |
parent | db023ea595015058270be6a62fe60a7b6b5c50d7 (diff) |
uprobes: Change write_opcode() to use FOLL_FORCE
write_opcode()->get_user_pages() needs FOLL_FORCE to ensure we can
read the page even if the probed task did mprotect(PROT_NONE) after
uprobe_register(). Without FOLL_WRITE, FOLL_FORCE doesn't have any
side effect but allows to read the !VM_READ memory.
Otherwiese the subsequent uprobe_unregister()->set_orig_insn() fails
and we leak "int3". If that task does mprotect(PROT_READ | EXEC) and
execute the probed insn later it will be killed.
Note: in fact this is also needed for _register, see the next patch.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/uprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 198d732ab901..80e8c7b697b9 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c | |||
@@ -221,7 +221,7 @@ static int write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, | |||
221 | 221 | ||
222 | retry: | 222 | retry: |
223 | /* Read the page with vaddr into memory */ | 223 | /* Read the page with vaddr into memory */ |
224 | ret = get_user_pages(NULL, mm, vaddr, 1, 0, 0, &old_page, &vma); | 224 | ret = get_user_pages(NULL, mm, vaddr, 1, 0, 1, &old_page, &vma); |
225 | if (ret <= 0) | 225 | if (ret <= 0) |
226 | return ret; | 226 | return ret; |
227 | 227 | ||