f3cdfc488e
runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
68 lines
1.4 KiB
Go
68 lines
1.4 KiB
Go
package link
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/cilium/ebpf"
|
|
)
|
|
|
|
type IterOptions struct {
|
|
// Program must be of type Tracing with attach type
|
|
// AttachTraceIter. The kind of iterator to attach to is
|
|
// determined at load time via the AttachTo field.
|
|
//
|
|
// AttachTo requires the kernel to include BTF of itself,
|
|
// and it to be compiled with a recent pahole (>= 1.16).
|
|
Program *ebpf.Program
|
|
}
|
|
|
|
// AttachIter attaches a BPF seq_file iterator.
|
|
func AttachIter(opts IterOptions) (*Iter, error) {
|
|
link, err := AttachRawLink(RawLinkOptions{
|
|
Program: opts.Program,
|
|
Attach: ebpf.AttachTraceIter,
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("can't link iterator: %w", err)
|
|
}
|
|
|
|
return &Iter{*link}, err
|
|
}
|
|
|
|
// LoadPinnedIter loads a pinned iterator from a bpffs.
|
|
func LoadPinnedIter(fileName string, opts *ebpf.LoadPinOptions) (*Iter, error) {
|
|
link, err := LoadPinnedRawLink(fileName, IterType, opts)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &Iter{*link}, err
|
|
}
|
|
|
|
// Iter represents an attached bpf_iter.
|
|
type Iter struct {
|
|
RawLink
|
|
}
|
|
|
|
// Open creates a new instance of the iterator.
|
|
//
|
|
// Reading from the returned reader triggers the BPF program.
|
|
func (it *Iter) Open() (io.ReadCloser, error) {
|
|
linkFd, err := it.fd.Value()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
attr := &bpfIterCreateAttr{
|
|
linkFd: linkFd,
|
|
}
|
|
|
|
fd, err := bpfIterCreate(attr)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("can't create iterator: %w", err)
|
|
}
|
|
|
|
return fd.File("bpf_iter"), nil
|
|
}
|