uprobes: Skip breakpoint installation on non executable vmas
Subsystems (3)
PATCH 1/1 uprobes: Skip breakpoint installation on non executable vmas
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe { printf("%s\n", str(arg1) ); exit(); }'
expects a semaphore increment of 1, but semaphore gets double incremented
Test program:
https://github.com/bpftrace/bpftrace/blob/master/tests/testprogs/usdt_semaphore_test.c
Reason: .text mapping and RELRO mapping resolve to the same page aligned file offset 0
01000000-01001000 r-xp 00000000 5e:01 usdt_semaphore_test (.text) 01001000-01002000 r--p 00000000 5e:01 usdt_semaphore_test (RELRO) 01002000-01003000 rw-p 00001000 5e:01 usdt_semaphore_test (semaphore)
valid_vma() currently accepts both mappings (which contains executable text and RELRO mapping) during uprobe registration, since both have VM_MAYEXEC set. This causes register_for_each_vma() to call install_breakpoint() twice for the same underlying uprobe offset in the process. This means, update_ref_ctr() is called twice for the same process, so a usdt semaphore is incremented from 0 to 2.
Installing a breakpoint for mapping without VM_EXEC and updating usdt reference counter in that case is not useful.
Skip non VM_EXEC mappings in install_breakpoint(). This fixes semaphore double increment as shown in the above usecase.
--- kernel/events/uprobes.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/uprobes.c +3 -0
@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret; +if (!(vma->vm_flags &VM_EXEC )) +return 0 ; + ret =prepare_uprobe (uprobe, vma->vm_file, mm, vaddr);if (ret)return ret;
Signature · 1 line
2.53.0
Oleg Nesterov
maintainerQuoted 3 lines · Sumanth Korikkar
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe {
printf("%s\n", str(arg1) );exit(); }'
I am hoping that Andrii and Jiri (cc'ed) can take a look, I know nothing about usdt... And TBH, I don't even know what RELRO is ;)
Let me ask a couple of questions for now.
Quoted 4 lines
expects a semaphore increment of 1, but semaphore gets double incremented
Test program:
https://github.com/bpftrace/bpftrace/blob/master/tests/testprogs/usdt_semaphore_test.c
Perhaps you can provide the test-case which I could compile on my machine without libbpf-usdt/usdt.h?
And can you explain what the bpftrace cmd above actually does? I mean, where does it put the uprobe? I guess the ref_ctr_offset argument of uprobe_register() refers to USDT_DEFINE_SEMA() in that test-case...
Quoted 6 lines
Reason: .text mapping and RELRO mapping resolve to the same page aligned file offset 0
01000000-01001000 r-xp 00000000 5e:01usdt_semaphore_test(.text) 01001000-01002000 r--p 00000000 5e:01usdt_semaphore_test(RELRO) 01002000-01003000 rw-p 00001000 5e:01usdt_semaphore_test(semaphore)
Quoted 6 lines
valid_vma()currently accepts both mappings (which contains executable text and RELRO mapping) during uprobe registration, since both haveVM_MAYEXECset. This causesregister_for_each_vma()to callinstall_breakpoint()twice for the same underlying uprobe offset in the process. This means,update_ref_ctr()is called twice for the same process, so a usdt semaphore is incremented from 0 to 2.
So, 2 vmas map the same binary, install_breakpoint() is called twice. But, the 2nd install_breakpoint() -> ... -> uprobe_write() should see that the original insn was already replaced by int3, in this case verify_opcode() returns 0 and uprobe_write() should do nothing.
And, if this uprobe was optimized before the 2nd install_breakpoint(), uprobe_write() won't be called.
Hmm.
Quoted 16 lines
Installing a breakpoint for mapping without
VM_EXECand updating usdt reference counter in that case is not useful.Skip non
VM_EXECmappings ininstall_breakpoint(). This fixes semaphore double increment as shown in the above usecase.Signed-off-by Sumanth Korikkar <[email protected]>--- kernel/events/uprobes.c | 3 +++ 1 file changed, 3 insertions(+)kernel/events/uprobes.c +0
-0
kernel/events/uprobes.c static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, · line 1160
Quoted 6 lines
kernel/events/uprobes.c +3
-0@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret; +if (!(vma->vm_flags &VM_EXEC )) +return 0 ; +
Well, but then it makes more sense to change valid_vma() to nack the non VM_EXEC mappings ?
Oleg.
Quoted 6 lines · Oleg Nesterov
Quoted 3 lines · Sumanth Korikkar
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe {
printf("%s\n", str(arg1) );exit(); }'
does bpftrace care if USDT semaphore is set to 1 or 2, it shouldn't. As long as detaching decrements it from 2 back to zero we should be fine. Is that what's happening? If so, is there really a problem needing to be fixed?
Quoted 35 lines
I am hoping that Andrii and Jiri (cc'ed) can take a look, I know nothing about usdt... And TBH, I don't even know what RELRO is ;)
Let me ask a couple of questions for now.
Quoted 4 lines
expects a semaphore increment of 1, but semaphore gets double incremented
Test program:
https://github.com/bpftrace/bpftrace/blob/master/tests/testprogs/usdt_semaphore_test.cPerhaps you can provide the test-case which I could compile on my machine without
libbpf-usdt/usdt.h?And can you explain what the bpftrace cmd above actually does? I mean, where does it put the uprobe? I guess the
ref_ctr_offsetargument ofuprobe_register()refers toUSDT_DEFINE_SEMA()in that test-case...Quoted 6 lines
Reason: .text mapping and RELRO mapping resolve to the same page aligned file offset 0
01000000-01001000 r-xp 00000000 5e:01usdt_semaphore_test(.text) 01001000-01002000 r--p 00000000 5e:01usdt_semaphore_test(RELRO) 01002000-01003000 rw-p 00001000 5e:01usdt_semaphore_test(semaphore)Quoted 6 lines
valid_vma()currently accepts both mappings (which contains executable text and RELRO mapping) during uprobe registration, since both haveVM_MAYEXECset. This causesregister_for_each_vma()to callinstall_breakpoint()twice for the same underlying uprobe offset in the process. This means,update_ref_ctr()is called twice for the same process, so a usdt semaphore is incremented from 0 to 2.So, 2 vmas map the same binary,
install_breakpoint()is called twice. But, the 2ndinstall_breakpoint()-> ... ->uprobe_write()should see that the original insn was already replaced by int3, in this caseverify_opcode()returns 0 anduprobe_write()should do nothing.
Quoted 4 lines
And, if this uprobe was optimized before the 2nd
install_breakpoint(),uprobe_write()won't be called.Hmm.
Even though it's the same file offset, it is mapped to two different virtual addresses, so I think it should be two different memory pages that will have two separate int3 instructions. I don't think there is any contradiction or surprise, is there?
Quoted 6 lines
Quoted 6 lines
Installing a breakpoint for mapping without
VM_EXECand updating usdt reference counter in that case is not useful.Skip non
VM_EXECmappings ininstall_breakpoint(). This fixes semaphore double increment as shown in the above usecase.
You said that mapping is VM_MAYEXEC, which means that kernel allows to re-mmap it as executable, if that happens, we will miss uprobe in that location, so that's probably why breakpoint is installed for VM_MAYEXEC.
Anyways, I'm just not sure whether there is a real issue we are fixing, or it's just a proactive fix just in case. Can you elaborate?
Quoted 23 lines
Quoted 11 lines
Signed-off-by Sumanth Korikkar <[email protected]>--- kernel/events/uprobes.c | 3 +++ 1 file changed, 3 insertions(+)kernel/events/uprobes.c +0
-0kernel/events/uprobes.c static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, · line 1160
Quoted 6 lines
kernel/events/uprobes.c +3
-0@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret; +if (!(vma->vm_flags &VM_EXEC )) +return 0 ; +Well, but then it makes more sense to change
valid_vma()to nack the nonVM_EXECmappings ?Oleg.
Oleg Nesterov
maintainerQuoted 5 lines · Andrii Nakryiko
Quoted 3 lines · Oleg Nesterov
Quoted 1 line · Sumanth Korikkar
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe {
printf("%s\n", str(arg1) );exit(); }'does bpftrace care if USDT semaphore is set to 1 or 2, it shouldn't. As long as detaching decrements it from 2 back to zero we should be fine. Is that what's happening? If so, is there really a problem needing to be fixed?
Yes, I thought about that too...
Quoted 8 lines
Quoted 8 lines
So, 2 vmas map the same binary,
install_breakpoint()is called twice. But, the 2ndinstall_breakpoint()-> ... ->uprobe_write()should see that the original insn was already replaced by int3, in this caseverify_opcode()returns 0 anduprobe_write()should do nothing.And, if this uprobe was optimized before the 2nd
install_breakpoint(),uprobe_write()won't be called.
Quoted 6 lines
Quoted 1 line
Hmm.
Even though it's the same file offset, it is mapped to two different virtual addresses, so I think it should be two different memory pages that will have two separate int3 instructions. I don't think there is any contradiction or surprise, is there?
Ah, indeed I am stupid ;)
Yes, uprobe_write() creates the COW'ed anonymous page, so the 1st install_breakpoint() won't affect the 2nd mapping to the same binary.
Thanks Andrii!
Oleg.
Quoted 4 lines · Andrii Nakryiko
Quoted 3 lines · Oleg Nesterov
Quoted 1 line · Sumanth Korikkar
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe {
printf("%s\n", str(arg1) );exit(); }'does bpftrace care if USDT semaphore is set to 1 or 2, it shouldn't. As long as detaching decrements it from 2 back to zero we should be fine. Is that what's happening? If so, is there really a problem needing to be fixed?
USDT spec mentions the following:
https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation
If a semaphore is associated with a probe, it will be of type unsigned short. A semaphore may gate invocations of a probe; it must be set to a non-zero value to guarantee that the probe will be hit. "Semaphores are treated as a counter"; your tool should increment the semaphore to enable it, and decrement the semaphore when finished.
I do not know, if any application checks for exact value of 1 instead of semaphore > 0 check.
As suggested by Andrii and Oleg earlier - "uprobe_write() creates the COW'ed anonymous page, so the 1st install_breakpoint() won't affect the 2nd mapping to the same binary"
To me, the following looks like a valid point to consider the fix:
Installing a breakpoint on a non executable relro mapping is not useful because instructions are not executed on it. Anonymous COW page sits in memory untouched and memory is wasted.
Quoted 38 lines
Quoted 38 lines
I am hoping that Andrii and Jiri (cc'ed) can take a look, I know nothing about usdt... And TBH, I don't even know what RELRO is ;)
Let me ask a couple of questions for now.
Quoted 4 lines
expects a semaphore increment of 1, but semaphore gets double incremented
Test program:
https://github.com/bpftrace/bpftrace/blob/master/tests/testprogs/usdt_semaphore_test.cPerhaps you can provide the test-case which I could compile on my machine without
libbpf-usdt/usdt.h?And can you explain what the bpftrace cmd above actually does? I mean, where does it put the uprobe? I guess the
ref_ctr_offsetargument ofuprobe_register()refers toUSDT_DEFINE_SEMA()in that test-case...Quoted 6 lines
Reason: .text mapping and RELRO mapping resolve to the same page aligned file offset 0
01000000-01001000 r-xp 00000000 5e:01usdt_semaphore_test(.text) 01001000-01002000 r--p 00000000 5e:01usdt_semaphore_test(RELRO) 01002000-01003000 rw-p 00001000 5e:01usdt_semaphore_test(semaphore)Quoted 6 lines
valid_vma()currently accepts both mappings (which contains executable text and RELRO mapping) during uprobe registration, since both haveVM_MAYEXECset. This causesregister_for_each_vma()to callinstall_breakpoint()twice for the same underlying uprobe offset in the process. This means,update_ref_ctr()is called twice for the same process, so a usdt semaphore is incremented from 0 to 2.So, 2 vmas map the same binary,
install_breakpoint()is called twice. But, the 2ndinstall_breakpoint()-> ... ->uprobe_write()should see that the original insn was already replaced by int3, in this caseverify_opcode()returns 0 anduprobe_write()should do nothing.And, if this uprobe was optimized before the 2nd
install_breakpoint(),uprobe_write()won't be called.
Quoted 6 lines
Quoted 1 line
Hmm.
Even though it's the same file offset, it is mapped to two different virtual addresses, so I think it should be two different memory pages that will have two separate int3 instructions. I don't think there is any contradiction or surprise, is there?
True. cross checked the behaviour with bpftrace stacktrace. Pasted the output in previous thread.
Quoted 10 lines
Quoted 5 lines
Quoted 5 lines
Installing a breakpoint for mapping without
VM_EXECand updating usdt reference counter in that case is not useful.Skip non
VM_EXECmappings ininstall_breakpoint(). This fixes semaphore double increment as shown in the above usecase.You said that mapping is
VM_MAYEXEC, which means that kernel allows to re-mmap it as executable, if that happens, we will miss uprobe in that location, so that's probably why breakpoint is installed forVM_MAYEXEC.
True.
ref commit 78a320542e6c ("uprobes: Change valid_vma() to demand VM_MAYEXEC rather than VM_EXEC")
Thank you
Quoted 7 lines
Quoted 4 lines
Even though it's the same file offset, it is mapped to two different virtual addresses, so I think it should be two different memory pages that will have two separate int3 instructions. I don't think there is any contradiction or surprise, is there?
True. cross checked the behaviour with bpftrace stacktrace. Pasted the output in previous thread.
I meant to say the following in response to your reply:
"Even though it's the same file offset, it is mapped to two different virtual addresses, so I think it should be two different memory pages that will have two separate int3 instructions."
Right, and traced this behaviour using bpftrace stacktrace. stacktrace is pasted in the previous thread.
Quoted 10 lines
Quoted 10 lines
Quoted 5 lines
Quoted 5 lines
Installing a breakpoint for mapping without
VM_EXECand updating usdt reference counter in that case is not useful.Skip non
VM_EXECmappings ininstall_breakpoint(). This fixes semaphore double increment as shown in the above usecase.You said that mapping is
VM_MAYEXEC, which means that kernel allows to re-mmap it as executable, if that happens, we will miss uprobe in that location, so that's probably why breakpoint is installed forVM_MAYEXEC.
ref commit 78a320542e6c ("uprobes: Change valid_vma() to demand VM_MAYEXEC rather than VM_EXEC")
Thank you
Quoted 7 lines · Oleg Nesterov
Quoted 3 lines · Sumanth Korikkar
bpftrace -e 'usdt:./testprogs/usdt_semaphore_test:tracetest:testprobe {
printf("%s\n", str(arg1) );exit(); }'I am hoping that Andrii and Jiri (cc'ed) can take a look, I know nothing about usdt... And TBH, I don't even know what RELRO is ;)
Thank you Oleg and Andrii for the feedback.
As far as I understand, relro segment contains the following sections in the usdt_semaphore_test binary (s390)
.init_array, .fini_array, .dynamic, .got.
ld.so dynamic linker resolves all the relocations and fills in the got and then calls mprotect() to make the relro region read only. This prevents runtime modification of these data.
Quoted 7 lines
Let me ask a couple of questions for now.
Quoted 4 lines
expects a semaphore increment of 1, but semaphore gets double incremented
Test program:
https://github.com/bpftrace/bpftrace/blob/master/tests/testprogs/usdt_semaphore_test.c
Quoted 6 lines
Perhaps you can provide the test-case which I could compile on my machine without
libbpf-usdt/usdt.h?And can you explain what the bpftrace cmd above actually does? I mean, where does it put the uprobe? I guess the
ref_ctr_offsetargument ofuprobe_register()refers toUSDT_DEFINE_SEMA()in that test-case...
Right.
usdt_semaphore_test elf contains the following information in notes section:
Displaying notes found in: .note.stapsdt
Owner Data size Description
stapsdt 0x00000039 NT_STAPSDT (SystemTap probe descriptors)
Provider: tracetest
Name: testprobe
Location: 0x0000000001000742, Base: 0x00000000010007d4, Semaphore:
0x0000000001002024
Arguments: -8@%r1 8@%r2bpftrace and libbpf reads the uprobe offset and semaphore location from .note.stapsdt and calls bpf_uprobe_multi_link_attach()
bpf_program__attach_usdt()bpf_program__attach_uprobe_multi()bpf_link_create()
kernel side:
@[kprobe:__update_ref_ctr,
__update_ref_ctr+0
update_ref_ctr+242
uprobe_write+596
uprobe_write_opcode+76
set_swbp+42
install_breakpoint+106
register_for_each_vma+712
uprobe_register+308
bpf_uprobe_multi_link_attach+956
link_create+506
__sys_bpf+678
__s390x_sys_bpf+72
__do_syscall+360
system_call+114]
bpftrace -e 'kfunc:uprobe_register { printf("offset=0x%llx ref_ctr_offset=0x%llx\n", args.offset, args.ref_ctr_offset); }'
offset=0x742 ref_ctr_offset=0x1024
Quoted 18 lines
Quoted 6 lines
Reason: .text mapping and RELRO mapping resolve to the same page aligned file offset 0
01000000-01001000 r-xp 00000000 5e:01usdt_semaphore_test(.text) 01001000-01002000 r--p 00000000 5e:01usdt_semaphore_test(RELRO) 01002000-01003000 rw-p 00001000 5e:01usdt_semaphore_test(semaphore)Quoted 6 lines
valid_vma()currently accepts both mappings (which contains executable text and RELRO mapping) during uprobe registration, since both haveVM_MAYEXECset. This causesregister_for_each_vma()to callinstall_breakpoint()twice for the same underlying uprobe offset in the process. This means,update_ref_ctr()is called twice for the same process, so a usdt semaphore is incremented from 0 to 2.So, 2 vmas map the same binary,
install_breakpoint()is called twice. But, the 2ndinstall_breakpoint()-> ... ->uprobe_write()should see that the original insn was already replaced by int3, in this caseverify_opcode()returns 0 anduprobe_write()should do nothing.
Quoted 4 lines
And, if this uprobe was optimized before the 2nd
install_breakpoint(),uprobe_write()won't be called.Hmm.
I saw the following behaviour (without this patch) for usdt_semaphore_test:
sudo bpftrace -e '
kfunc:install_breakpoint
{
printf("pid=%d comm=%s vaddr=%#lx vm_start=%#lx vm_end=%#lx pgoff=%#lx flags=%#lx exec=%d\n",
pid,
comm,
args.vaddr,
args.vma->vm_start,
args.vma->vm_end,
args.vma->vm_pgoff,
args.vma->vm_flags,
(args.vma->vm_flags & 0x4) != 0);
}'Attached 1 probe
pid=3704 comm=bpftrace vaddr=0x1001742 vm_start=0x1001000 vm_end=0x1002000 pgoff=0 flags=0x8100071 exec=0 pid=3704 comm=bpftrace vaddr=0x1000742 vm_start=0x1000000 vm_end=0x1001000 pgoff=0 flags=0x8000075 exec=1
bpftrace -e 'kfunc:__update_ref_ctr
{
printf("vaddr=%#lx d=%d\n",
args.vaddr,
args.d);
}'Attached 1 probe
vaddr=0x1002024 d=1 (increment)
vaddr=0x1002024 d=1 (increment)
vaddr=0x1002024 d=-1 (decrement)
vaddr=0x1002024 d=-1 (decrement)
bpftrace -e '
kretfunc:verify_opcode
{
printf("verify_opcode vaddr=%#lx ret=%d\n", args.vaddr, retval);
}'Attached 1 probeverify_opcode vaddr=0x1001742 ret=1 (install breakpoint) verify_opcode vaddr=0x1000742 ret=1 (install) verify_opcode vaddr=0x1001742 ret=1 (remove) verify_opcode vaddr=0x1000742 ret=1 (remove)
So semphore incremented to 2 when a tracer was attached and decremented back to 0 when tracer was detached. install_breakpoint() was called for both vaddr and succeeded, also remove_breakpoint() succeeded for both vaddr.
Quoted 19 lines
Quoted 19 lines
Installing a breakpoint for mapping without
VM_EXECand updating usdt reference counter in that case is not useful.Skip non
VM_EXECmappings ininstall_breakpoint(). This fixes semaphore double increment as shown in the above usecase.Signed-off-by Sumanth Korikkar <[email protected]>--- kernel/events/uprobes.c | 3 +++ 1 file changed, 3 insertions(+)kernel/events/uprobes.c +0
-0@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret;
Quoted 6 lines
kernel/events/uprobes.c static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, · line 1160
Quoted 3 lines
kernel/events/uprobes.c +3
-0+if (!(vma->vm_flags &VM_EXEC )) +return 0 ; +Well, but then it makes more sense to change
valid_vma()to nack the nonVM_EXECmappings ?
After looking at your 2012 commit 78a320542e6c ("uprobes: Change valid_vma() to demand VM_MAYEXEC rather than VM_EXEC"), I thought changing it in valid_vma() was not the right approach.
"If a program maps memory as non executable initially, but it has VM_MAYEXEC permission, the program can later call mprotect(PROT_EXEC) to make it executable." So adding VM_EXEC in valid_vma() can be too strict.
Hence, I think install_breakpoint() can be one point where non VM_EXEC mapping can be restricted.
Oleg Nesterov
maintainerSumanth, thanks for details!
Quoted 5 lines · Sumanth Korikkar
So semphore incremented to 2 when a tracer was attached and decremented back to 0 when tracer was detached.
install_breakpoint()was called for both vaddr and succeeded, alsoremove_breakpoint()succeeded for both vaddr.
Then I agree with Andrii, we don't really care. IIUC, only the value of .active != 0 matters correctness-wise.
Quoted 13 lines
Quoted 6 lines
Quoted 6 lines
kernel/events/uprobes.c +0
-0@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret;Quoted 6 lines
kernel/events/uprobes.c static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, · line 1160
Quoted 3 lines
kernel/events/uprobes.c +3
-0+if (!(vma->vm_flags &VM_EXEC )) +return 0 ; +Well, but then it makes more sense to change
valid_vma()to nack the nonVM_EXECmappings ?
Quoted 8 lines
After looking at your 2012 commit
78a320542e6c("uprobes: Changevalid_vma()to demandVM_MAYEXECrather thanVM_EXEC"), I thought changing it invalid_vma()was not the right approach."If a program maps memory as non executable initially, but it has
VM_MAYEXECpermission, the program can later callmprotect(PROT_EXEC)to make it executable." So addingVM_EXECinvalid_vma()can be too strict.
Yes,
Quoted 2 lines
Hence, I think
install_breakpoint()can be one point where nonVM_EXECmapping can be restricted.
But your change in install_breakpoint() essentually reverts that commit? If uprobe_register() -> register_for_each_vma() finds a VM_MAYEXEC vma without VM_EXEC valid_vma() will return true, but then install_breakpoint() will fail anyway.
Oleg.
Quoted 39 lines · Oleg Nesterov
Sumanth, thanks for details!
Quoted 5 lines · Sumanth Korikkar
So semphore incremented to 2 when a tracer was attached and decremented back to 0 when tracer was detached.
install_breakpoint()was called for both vaddr and succeeded, alsoremove_breakpoint()succeeded for both vaddr.Then I agree with Andrii, we don't really care. IIUC, only the value of .active != 0 matters correctness-wise.
Quoted 13 lines
Quoted 6 lines
Quoted 6 lines
kernel/events/uprobes.c +0
-0@@ -1155,6 +1155,9 @@ static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma,bool first_uprobe;int ret;Quoted 6 lines
kernel/events/uprobes.c static int install_breakpoint(struct uprobe *uprobe, struct vm_area_struct *vma, · line 1160
Quoted 3 lines
kernel/events/uprobes.c +3
-0+if (!(vma->vm_flags &VM_EXEC )) +return 0 ; +Well, but then it makes more sense to change
valid_vma()to nack the nonVM_EXECmappings ?Quoted 8 lines
After looking at your 2012 commit
78a320542e6c("uprobes: Changevalid_vma()to demandVM_MAYEXECrather thanVM_EXEC"), I thought changing it invalid_vma()was not the right approach."If a program maps memory as non executable initially, but it has
VM_MAYEXECpermission, the program can later callmprotect(PROT_EXEC)to make it executable." So addingVM_EXECinvalid_vma()can be too strict.Yes,
Quoted 2 lines
Hence, I think
install_breakpoint()can be one point where nonVM_EXECmapping can be restricted.
Quoted 6 lines
But your change in
install_breakpoint()essentually reverts that commit? Ifuprobe_register()->register_for_each_vma()finds aVM_MAYEXECvma withoutVM_EXECvalid_vma()will return true, but theninstall_breakpoint()will fail anyway.Oleg.
Initially non exec vma will be ignored via uprobe_register(), install_breakpoint() will reject non vma mappings initially.
As far as I understand, if mprotect(PROT_EXEC) is performed later by a process, it adds VM_EXEC flag to vma and calls vma_complete() via vma_modify_flags(). uprobe_mmap() will then call install_breakpoint() and now it should succeed because VM_EXEC is set.
So, it doesnt really revert 2012 commit. But it just defers installation of breakpoint until the vma actually becomes executable right?.
Thanks
Oleg Nesterov
maintainerQuoted 8 lines · Sumanth Korikkar
Quoted 5 lines · Oleg Nesterov
But your change in
install_breakpoint()essentually reverts that commit? Ifuprobe_register()->register_for_each_vma()finds aVM_MAYEXECvma withoutVM_EXECvalid_vma()will return true, but theninstall_breakpoint()will fail anyway.
Quoted 7 lines
Initially non exec vma will be ignored via
uprobe_register(),install_breakpoint()will reject non vma mappings initially.As far as I understand, if
mprotect(PROT_EXEC)is performed later by a process, it addsVM_EXECflag to vma and callsvma_complete()viavma_modify_flags().uprobe_mmap()will then callinstall_breakpoint()and now it should succeed becauseVM_EXECis set.
Heh, I am stupid the 2nd time in the same thread ;)
Sumanth, thanks for correcting me! It seems that I forgot everything about these code paths.
Then this change makes more sense, but the VM_EXEC check needs the comment to explain this all.
However, I personally still don't think it's worth "fixing". But I leave the decision to Andrii and Jiri who (unlike me) understand how USDT's are used.
Oleg.
Quoted 20 lines · Oleg Nesterov
Quoted 8 lines · Sumanth Korikkar
Quoted 5 lines · Oleg Nesterov
But your change in
install_breakpoint()essentually reverts that commit? Ifuprobe_register()->register_for_each_vma()finds aVM_MAYEXECvma withoutVM_EXECvalid_vma()will return true, but theninstall_breakpoint()will fail anyway.Quoted 7 lines
Initially non exec vma will be ignored via
uprobe_register(),install_breakpoint()will reject non vma mappings initially.As far as I understand, if
mprotect(PROT_EXEC)is performed later by a process, it addsVM_EXECflag to vma and callsvma_complete()viavma_modify_flags().uprobe_mmap()will then callinstall_breakpoint()and now it should succeed becauseVM_EXECis set.Heh, I am stupid the 2nd time in the same thread ;)
Quoted 9 lines
Sumanth, thanks for correcting me! It seems that I forgot everything about these code paths.
Then this change makes more sense, but the
VM_EXECcheck needs the comment to explain this all.However, I personally still don't think it's worth "fixing". But I leave the decision to Andrii and Jiri who (unlike me) understand how USDT's are used.
I agree, I don't see what needs to be fixed here.
Quoted 2 lines
Oleg.