merge #4119 into opencontainers/runc:main

lfbzhm (2):
  fix some unit test error after bump ebpf to 0.12.3
  bump github.com/cilium/ebpf from 0.12.2 to 0.12.3

LGTMs: kolyshkin cyphar

Author: cyphar

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/checkpoint-restore/go-criu/v6 v6.3.0
-	github.com/cilium/ebpf v0.12.2
+	github.com/cilium/ebpf v0.12.3
 	github.com/containerd/console v1.0.3
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/cyphar/filepath-securejoin v0.2.4
@@ -21,7 +21,7 @@ require (
 	github.com/urfave/cli v1.22.12
 	github.com/vishvananda/netlink v1.1.0
 	golang.org/x/net v0.17.0
-	golang.org/x/sys v0.13.0
+	golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c
 	google.golang.org/protobuf v1.31.0
 )
 

go.sum

@@ -1,8 +1,8 @@
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/checkpoint-restore/go-criu/v6 v6.3.0 h1:mIdrSO2cPNWQY1truPg6uHLXyKHk3Z5Odx4wjKOASzA=
 github.com/checkpoint-restore/go-criu/v6 v6.3.0/go.mod h1:rrRTN/uSwY2X+BPRl/gkulo9gsKOSAeVp9/K2tv7xZI=
-github.com/cilium/ebpf v0.12.2 h1:cP3qL4kkl19kr/F+hKqUo9F9pPMVz1oms8C7Qj0AwWk=
-github.com/cilium/ebpf v0.12.2/go.mod h1:u9H29/Iq+8cy70YqI6p5pfADkFl3vdnV2qXDg5JL0Zo=
+github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4=
+github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
 github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
@@ -71,8 +71,8 @@ golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c h1:3kC/TjQ+xzIblQv39bCOyRk8fbEeJcDHwbyxPUU2BpA=
+golang.org/x/sys v0.14.1-0.20231108175955-e4099bfacb8c/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

libcontainer/cgroups/devices/devicefilter_test.go

@@ -39,14 +39,14 @@ func TestDeviceFilter_Nil(t *testing.T) {
 	expected := `
 // load parameters into registers
         0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
-        1: And32Imm dst: r2 imm: 65535
+        1: AndImm32 dst: r2 imm: 65535
         2: LdXMemW dst: r3 src: r1 off: 0 imm: 0
-        3: RSh32Imm dst: r3 imm: 16
+        3: RShImm32 dst: r3 imm: 16
         4: LdXMemW dst: r4 src: r1 off: 4 imm: 0
         5: LdXMemW dst: r5 src: r1 off: 8 imm: 0
 block-0:
 // return 0 (reject)
-        6: Mov32Imm dst: r0 imm: 0
+        6: MovImm32 dst: r0 imm: 0
         7: Exit
 	`
 	testDeviceFilter(t, nil, expected)
@@ -56,77 +56,77 @@ func TestDeviceFilter_BuiltInAllowList(t *testing.T) {
 	expected := `
 // load parameters into registers
         0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
-        1: And32Imm dst: r2 imm: 65535
+        1: AndImm32 dst: r2 imm: 65535
         2: LdXMemW dst: r3 src: r1 off: 0 imm: 0
-        3: RSh32Imm dst: r3 imm: 16
+        3: RShImm32 dst: r3 imm: 16
         4: LdXMemW dst: r4 src: r1 off: 4 imm: 0
         5: LdXMemW dst: r5 src: r1 off: 8 imm: 0
 block-0:
 // (b, wildcard, wildcard, m, true)
         6: JNEImm dst: r2 off: -1 imm: 1 <block-1>
-        7: Mov32Reg dst: r1 src: r3
-        8: And32Imm dst: r1 imm: 1
+        7: MovReg32 dst: r1 src: r3
+        8: AndImm32 dst: r1 imm: 1
         9: JNEReg dst: r1 off: -1 src: r3 <block-1>
-        10: Mov32Imm dst: r0 imm: 1
+        10: MovImm32 dst: r0 imm: 1
         11: Exit
 block-1:
 // (c, wildcard, wildcard, m, true)
         12: JNEImm dst: r2 off: -1 imm: 2 <block-2>
-        13: Mov32Reg dst: r1 src: r3
-        14: And32Imm dst: r1 imm: 1
+        13: MovReg32 dst: r1 src: r3
+        14: AndImm32 dst: r1 imm: 1
         15: JNEReg dst: r1 off: -1 src: r3 <block-2>
-        16: Mov32Imm dst: r0 imm: 1
+        16: MovImm32 dst: r0 imm: 1
         17: Exit
 block-2:
         18: JNEImm dst: r2 off: -1 imm: 2 <block-3>
         19: JNEImm dst: r4 off: -1 imm: 1 <block-3>
         20: JNEImm dst: r5 off: -1 imm: 3 <block-3>
-        21: Mov32Imm dst: r0 imm: 1
+        21: MovImm32 dst: r0 imm: 1
         22: Exit
 block-3:
         23: JNEImm dst: r2 off: -1 imm: 2 <block-4>
         24: JNEImm dst: r4 off: -1 imm: 1 <block-4>
         25: JNEImm dst: r5 off: -1 imm: 5 <block-4>
-        26: Mov32Imm dst: r0 imm: 1
+        26: MovImm32 dst: r0 imm: 1
         27: Exit
 block-4:
         28: JNEImm dst: r2 off: -1 imm: 2 <block-5>
         29: JNEImm dst: r4 off: -1 imm: 1 <block-5>
         30: JNEImm dst: r5 off: -1 imm: 7 <block-5>
-        31: Mov32Imm dst: r0 imm: 1
+        31: MovImm32 dst: r0 imm: 1
         32: Exit
 block-5:
         33: JNEImm dst: r2 off: -1 imm: 2 <block-6>
         34: JNEImm dst: r4 off: -1 imm: 1 <block-6>
         35: JNEImm dst: r5 off: -1 imm: 8 <block-6>
-        36: Mov32Imm dst: r0 imm: 1
+        36: MovImm32 dst: r0 imm: 1
         37: Exit
 block-6:
         38: JNEImm dst: r2 off: -1 imm: 2 <block-7>
         39: JNEImm dst: r4 off: -1 imm: 1 <block-7>
         40: JNEImm dst: r5 off: -1 imm: 9 <block-7>
-        41: Mov32Imm dst: r0 imm: 1
+        41: MovImm32 dst: r0 imm: 1
         42: Exit
 block-7:
         43: JNEImm dst: r2 off: -1 imm: 2 <block-8>
         44: JNEImm dst: r4 off: -1 imm: 5 <block-8>
         45: JNEImm dst: r5 off: -1 imm: 0 <block-8>
-        46: Mov32Imm dst: r0 imm: 1
+        46: MovImm32 dst: r0 imm: 1
         47: Exit
 block-8:
         48: JNEImm dst: r2 off: -1 imm: 2 <block-9>
         49: JNEImm dst: r4 off: -1 imm: 5 <block-9>
         50: JNEImm dst: r5 off: -1 imm: 2 <block-9>
-        51: Mov32Imm dst: r0 imm: 1
+        51: MovImm32 dst: r0 imm: 1
         52: Exit
 block-9:
 // /dev/pts (c, 136, wildcard, rwm, true)
         53: JNEImm dst: r2 off: -1 imm: 2 <block-10>
         54: JNEImm dst: r4 off: -1 imm: 136 <block-10>
-        55: Mov32Imm dst: r0 imm: 1
+        55: MovImm32 dst: r0 imm: 1
         56: Exit
 block-10:
-        57: Mov32Imm dst: r0 imm: 0
+        57: MovImm32 dst: r0 imm: 0
         58: Exit
 `
 	var devices []*devices.Rule
@@ -149,14 +149,14 @@ func TestDeviceFilter_Privileged(t *testing.T) {
 	expected := `
 // load parameters into registers
         0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
-        1: And32Imm dst: r2 imm: 65535
+        1: AndImm32 dst: r2 imm: 65535
         2: LdXMemW dst: r3 src: r1 off: 0 imm: 0
-        3: RSh32Imm dst: r3 imm: 16
+        3: RShImm32 dst: r3 imm: 16
         4: LdXMemW dst: r4 src: r1 off: 4 imm: 0
         5: LdXMemW dst: r5 src: r1 off: 8 imm: 0
 block-0:
 // return 1 (accept)
-        6: Mov32Imm dst: r0 imm: 1
+        6: MovImm32 dst: r0 imm: 1
         7: Exit
 	`
 	testDeviceFilter(t, devices, expected)
@@ -182,21 +182,21 @@ func TestDeviceFilter_PrivilegedExceptSingleDevice(t *testing.T) {
 	expected := `
 // load parameters into registers
          0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
-         1: And32Imm dst: r2 imm: 65535
+         1: AndImm32 dst: r2 imm: 65535
          2: LdXMemW dst: r3 src: r1 off: 0 imm: 0
-         3: RSh32Imm dst: r3 imm: 16
+         3: RShImm32 dst: r3 imm: 16
          4: LdXMemW dst: r4 src: r1 off: 4 imm: 0
          5: LdXMemW dst: r5 src: r1 off: 8 imm: 0
 block-0:
 // return 0 (reject) if type==b && major == 8 && minor == 0
          6: JNEImm dst: r2 off: -1 imm: 1 <block-1>
          7: JNEImm dst: r4 off: -1 imm: 8 <block-1>
          8: JNEImm dst: r5 off: -1 imm: 0 <block-1>
-         9: Mov32Imm dst: r0 imm: 0
+         9: MovImm32 dst: r0 imm: 0
         10: Exit
 block-1:
 // return 1 (accept)
-        11: Mov32Imm dst: r0 imm: 1
+        11: MovImm32 dst: r0 imm: 1
         12: Exit
 `
 	testDeviceFilter(t, devices, expected)
@@ -231,21 +231,21 @@ func TestDeviceFilter_Weird(t *testing.T) {
 	expected := `
 // load parameters into registers
          0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
-         1: And32Imm dst: r2 imm: 65535
+         1: AndImm32 dst: r2 imm: 65535
          2: LdXMemW dst: r3 src: r1 off: 0 imm: 0
-         3: RSh32Imm dst: r3 imm: 16
+         3: RShImm32 dst: r3 imm: 16
          4: LdXMemW dst: r4 src: r1 off: 4 imm: 0
          5: LdXMemW dst: r5 src: r1 off: 8 imm: 0
 block-0:
 // return 0 (reject) if type==b && major == 8 && minor == 2
          6: JNEImm dst: r2 off: -1 imm: 1 <block-1>
          7: JNEImm dst: r4 off: -1 imm: 8 <block-1>
          8: JNEImm dst: r5 off: -1 imm: 2 <block-1>
-         9: Mov32Imm dst: r0 imm: 0
+         9: MovImm32 dst: r0 imm: 0
         10: Exit
 block-1:
 // return 1 (accept)
-        11: Mov32Imm dst: r0 imm: 1
+        11: MovImm32 dst: r0 imm: 1
         12: Exit
 `
 	testDeviceFilter(t, devices, expected)