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>
36 lines
681 B
Go
36 lines
681 B
Go
package internal
|
|
|
|
import (
|
|
"unsafe"
|
|
|
|
"github.com/cilium/ebpf/internal/unix"
|
|
)
|
|
|
|
// NewPointer creates a 64-bit pointer from an unsafe Pointer.
|
|
func NewPointer(ptr unsafe.Pointer) Pointer {
|
|
return Pointer{ptr: ptr}
|
|
}
|
|
|
|
// NewSlicePointer creates a 64-bit pointer from a byte slice.
|
|
func NewSlicePointer(buf []byte) Pointer {
|
|
if len(buf) == 0 {
|
|
return Pointer{}
|
|
}
|
|
|
|
return Pointer{ptr: unsafe.Pointer(&buf[0])}
|
|
}
|
|
|
|
// NewStringPointer creates a 64-bit pointer from a string.
|
|
func NewStringPointer(str string) Pointer {
|
|
if str == "" {
|
|
return Pointer{}
|
|
}
|
|
|
|
p, err := unix.BytePtrFromString(str)
|
|
if err != nil {
|
|
return Pointer{}
|
|
}
|
|
|
|
return Pointer{ptr: unsafe.Pointer(p)}
|
|
}
|