From 5eef441a29d0c17c00f47135ad04aca53af1ac382660bc376ada933ab02ef221 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 1 Jul 2021 10:36:06 +0000 Subject: [PATCH] Accepting request 903380 from home:cyphar:docker Cherry-pick patch correctly so it applies cleanly... OBS-URL: https://build.opensuse.org/request/show/903380 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=115 --- ...bpf-ignore-inaccessible-existing-programs.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boo1187704-0001-cgroupv2-ebpf-ignore-inaccessible-existing-programs.patch b/boo1187704-0001-cgroupv2-ebpf-ignore-inaccessible-existing-programs.patch index 63675a9..fa3abb5 100644 --- a/boo1187704-0001-cgroupv2-ebpf-ignore-inaccessible-existing-programs.patch +++ b/boo1187704-0001-cgroupv2-ebpf-ignore-inaccessible-existing-programs.patch @@ -1,4 +1,4 @@ -From 1f0f25356e7616869eb68a137eee22d9adc204b2 Mon Sep 17 00:00:00 2001 +From e54bd299f9e170fe35041c839ab90206f02e4df0 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 1 Jul 2021 12:55:08 +1000 Subject: [PATCH] cgroupv2: ebpf: ignore inaccessible existing programs @@ -30,17 +30,17 @@ Signed-off-by: Aleksa Sarai 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod -index df98934d3d50..b155440e1e32 100644 +index 6262a12198ca..95d14b12b36c 100644 --- a/go.mod +++ b/go.mod -@@ -25,3 +25,5 @@ require ( +@@ -26,3 +26,5 @@ require ( golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 - google.golang.org/protobuf v1.27.1 + google.golang.org/protobuf v1.26.0 ) + +replace github.com/cilium/ebpf => github.com/cyphar/ebpf v0.6.1-0.20210701060515-e654431ae87f diff --git a/go.sum b/go.sum -index 15d3ac3fa791..413f1361ece6 100644 +index 0bc7fd057207..00bb16d7ff6f 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,10 @@ github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzA @@ -55,7 +55,7 @@ index 15d3ac3fa791..413f1361ece6 100644 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/libcontainer/cgroups/ebpf/ebpf_linux.go b/libcontainer/cgroups/ebpf/ebpf_linux.go -index fa1b04e25991..b4141aaf6699 100644 +index fccf3931d6ee..dd119ad4f7a5 100644 --- a/libcontainer/cgroups/ebpf/ebpf_linux.go +++ b/libcontainer/cgroups/ebpf/ebpf_linux.go @@ -59,13 +59,26 @@ func findAttachedCgroupDeviceFilters(dirFd int) ([]*ebpf.Program, error) { @@ -106,7 +106,7 @@ index c530aadd9a5b..82678eb4043d 100644 func wrapMapError(err error) error { diff --git a/vendor/modules.txt b/vendor/modules.txt -index 8c99aca8c125..7797d5acecb5 100644 +index 6878ffcfb192..2da80d8ee4f6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3,7 +3,7 @@ github.com/bits-and-blooms/bitset