
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>
62 lines
1.5 KiB
Go
62 lines
1.5 KiB
Go
package link
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/cilium/ebpf"
|
|
"github.com/cilium/ebpf/internal"
|
|
)
|
|
|
|
type RawTracepointOptions struct {
|
|
// Tracepoint name.
|
|
Name string
|
|
// Program must be of type RawTracepoint*
|
|
Program *ebpf.Program
|
|
}
|
|
|
|
// AttachRawTracepoint links a BPF program to a raw_tracepoint.
|
|
//
|
|
// Requires at least Linux 4.17.
|
|
func AttachRawTracepoint(opts RawTracepointOptions) (Link, error) {
|
|
if t := opts.Program.Type(); t != ebpf.RawTracepoint && t != ebpf.RawTracepointWritable {
|
|
return nil, fmt.Errorf("invalid program type %s, expected RawTracepoint(Writable)", t)
|
|
}
|
|
if opts.Program.FD() < 0 {
|
|
return nil, fmt.Errorf("invalid program: %w", internal.ErrClosedFd)
|
|
}
|
|
|
|
fd, err := bpfRawTracepointOpen(&bpfRawTracepointOpenAttr{
|
|
name: internal.NewStringPointer(opts.Name),
|
|
fd: uint32(opts.Program.FD()),
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &progAttachRawTracepoint{fd: fd}, nil
|
|
}
|
|
|
|
type progAttachRawTracepoint struct {
|
|
fd *internal.FD
|
|
}
|
|
|
|
var _ Link = (*progAttachRawTracepoint)(nil)
|
|
|
|
func (rt *progAttachRawTracepoint) isLink() {}
|
|
|
|
func (rt *progAttachRawTracepoint) Close() error {
|
|
return rt.fd.Close()
|
|
}
|
|
|
|
func (rt *progAttachRawTracepoint) Update(_ *ebpf.Program) error {
|
|
return fmt.Errorf("can't update raw_tracepoint: %w", ErrNotSupported)
|
|
}
|
|
|
|
func (rt *progAttachRawTracepoint) Pin(_ string) error {
|
|
return fmt.Errorf("can't pin raw_tracepoint: %w", ErrNotSupported)
|
|
}
|
|
|
|
func (rt *progAttachRawTracepoint) Unpin() error {
|
|
return fmt.Errorf("unpin raw_tracepoint: %w", ErrNotSupported)
|
|
}
|