libbpf: don't adjust USDT semaphore address if .stapsdt.base addr is missing
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: don't adjust USDT semaphore address if .stapsdt.base addr is missing
USDT ELF note optionally can record an offset of .stapsdt.base, which is used to make adjustments to USDT target attach address. Currently, libbpf will do this address adjustment unconditionally if it finds .stapsdt.base ELF section in target binary. But there is a corner case where .stapsdt.base ELF section is present, but specific USDT note doesn't reference it. In such case, libbpf will basically just add base address and end up with absolutely incorrect USDT target address.
This adjustment has to be done only if both .stapsdt.sema section is present and USDT note is recording a reference to it.
--- tools/lib/bpf/usdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/usdt.c +1 -1
@@ -661,7 +661,7 @@ static int collect_usdt_targets(struct usdt_manager *man, Elf *elf, const char ** [0] https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation */ usdt_abs_ip = note.loc_addr; -if (base_addr) +if (base_addr && note.base_addr) usdt_abs_ip += base_addr - note.base_addr;/* When attaching uprobes (which is what USDTs basically are)
Signature · 1 line
2.43.5
Quoted 8 lines · Andrii Nakryiko
USDT ELF note optionally can record an offset of .stapsdt.base, which is used to make adjustments to USDT target attach address. Currently, libbpf will do this address adjustment unconditionally if it finds .stapsdt.base ELF section in target binary. But there is a corner case where .stapsdt.base ELF section is present, but specific USDT note doesn't reference it. In such case, libbpf will basically just add base address and end up with absolutely incorrect USDT target address.
Quoted 5 lines
This adjustment has to be done only if both .stapsdt.sema section is present and USDT note is recording a reference to it.
Fixes 74cc6311cec9 ("libbpf: Add USDT notes parsing and resolution logic")Signed-off-by Andrii Nakryiko <[email protected]>
nice, lgtm
jirka
Quoted 21 lines
--- tools/lib/bpf/usdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/lib/bpf/usdt.c +1
-1@@ -661,7 +661,7 @@ static int collect_usdt_targets(struct usdt_manager *man, Elf *elf, const char ** [0] https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation */ usdt_abs_ip = note.loc_addr; -if (base_addr) +if (base_addr && note.base_addr) usdt_abs_ip += base_addr - note.base_addr;/* When attaching uprobes (which is what USDTs basically are) Signature · 1 line
2.43.5
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Thu, 21 Nov 2024 14:45:58 -0800 you wrote:
USDT ELF note optionally can record an offset of .stapsdt.base, which is used to make adjustments to USDT target attach address. Currently, libbpf will do this address adjustment unconditionally if it finds .stapsdt.base ELF section in target binary. But there is a corner case where .stapsdt.base ELF section is present, but specific USDT note doesn't reference it. In such case, libbpf will basically just add base address and end up with absolutely incorrect USDT target address.
[...]
Here is the summary with links:
- [bpf-next] libbpf: don't adjust USDT semaphore address if .stapsdt.base addr is missing
https://git.kernel.org/bpf/bpf-next/c/d00058e676a9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html