linker: fix fd leak in fixupKfuncs #1145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The kfunc fixup code doesn't properly close the btf.Handle if the
compatibility check fails:
leaked fd created at:
github.com/cilium/ebpf/internal/sys.newFD+0x26
/home/lorenz/dev/ebpf/internal/sys/fd.go:23
github.com/cilium/ebpf/internal/sys.NewFD+0x24
/home/lorenz/dev/ebpf/internal/sys/fd.go:63
github.com/cilium/ebpf/internal/sys.BtfGetFdById+0x36
/home/lorenz/dev/ebpf/internal/sys/types.go:583
github.com/cilium/ebpf/btf.NewHandleFromID+0x2e
/home/lorenz/dev/ebpf/btf/handle.go:83
github.com/cilium/ebpf/btf.(*HandleIterator).Next+0xa4
/home/lorenz/dev/ebpf/btf/handle.go:228
github.com/cilium/ebpf.findTargetInModule+0xc9
/home/lorenz/dev/ebpf/prog.go:965
github.com/cilium/ebpf.findTargetInKernel+0xe4
/home/lorenz/dev/ebpf/prog.go:943
github.com/cilium/ebpf.fixupKfuncs+0x3ef
/home/lorenz/dev/ebpf/linker.go:284
github.com/cilium/ebpf.newProgramWithOptions+0x80d
/home/lorenz/dev/ebpf/prog.go:277
github.com/cilium/ebpf.(*collectionLoader).loadProgram+0x415
/home/lorenz/dev/ebpf/collection.go:522
github.com/cilium/ebpf.NewCollectionWithOptions+0x239
/home/lorenz/dev/ebpf/collection.go:385
github.com/cilium/ebpf.NewCollection+0x44
/home/lorenz/dev/ebpf/collection.go:358
github.com/cilium/ebpf.LoadCollection+0x45
/home/lorenz/dev/ebpf/collection.go:680
github.com/cilium/ebpf.TestInvalidKfunc+0xcb
/home/lorenz/dev/ebpf/elf_reader_test.go:740
testing.tRunner+0xfe
/usr/local/go/src/testing/testing.go:1595
runtime.goexit+0x0
/usr/local/go/src/runtime/asm_amd64.s:1650
Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Close the module if looking up the target type in the spec fails. This prevents leaking the module fd. Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
lmb
force-pushed
the
linker-kfunc-fixup-fd-leak
branch
from
16ab364
to
21a7b56
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
linker: fix fd leak in fixupKfuncs
program: fix potential fd leak in findTargetInKernel