Skip to content

Commit 18acc61

Browse files
authored
Merge pull request #28653 from kolyshkin/selinux1140
Update oc/selinux to v1.14.1
2 parents 00d375f + 40e572f commit 18acc61

10 files changed

Lines changed: 451 additions & 269 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/opencontainers/image-spec v1.1.1
5454
github.com/opencontainers/runtime-spec v1.3.0
5555
github.com/opencontainers/runtime-tools v0.9.1-0.20260316125833-8a4db579f5c8
56-
github.com/opencontainers/selinux v1.13.1
56+
github.com/opencontainers/selinux v1.14.1
5757
github.com/openshift/imagebuilder v1.2.21
5858
github.com/rootless-containers/rootlesskit/v2 v2.3.6
5959
github.com/shirou/gopsutil/v4 v4.26.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ github.com/opencontainers/runtime-spec v1.3.0 h1:YZupQUdctfhpZy3TM39nN9Ika5CBWT5
303303
github.com/opencontainers/runtime-spec v1.3.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
304304
github.com/opencontainers/runtime-tools v0.9.1-0.20260316125833-8a4db579f5c8 h1:2NAWFjN0PmdIe3XojVL9wf3lJ1//VqAgc7MOSYHQslE=
305305
github.com/opencontainers/runtime-tools v0.9.1-0.20260316125833-8a4db579f5c8/go.mod h1:DKDEfzxvRkoQ6n9TGhxQgg2IM1lY4aM0eaQP4e3oElw=
306-
github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE=
307-
github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg=
306+
github.com/opencontainers/selinux v1.14.1 h1:a7XlXV/nN/l5zFP1FWZYoExpClu1QOPMfWUV2CZ8kEQ=
307+
github.com/opencontainers/selinux v1.14.1/go.mod h1:LenyElirjUHszfxrjuFqC85HIeXZKumHcKMQtnaDlQQ=
308308
github.com/openshift/imagebuilder v1.2.21 h1:XX0tZVznWTxzYevvNVZ/0eeTzmgY6cfcT4/xjs5ToyU=
309309
github.com/openshift/imagebuilder v1.2.21/go.mod h1:+L09sXUQ0RPdCU1tmzKrfBhqMlYvZtaA3MHb7aTjVU8=
310310
github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=

pkg/selinux/selinux.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ func KVMLabel(cLabel string) (string, error) {
1010
// selinux is disabled
1111
return "", nil
1212
}
13-
processLabel, _ := selinux.KVMContainerLabels()
13+
processLabel, err := selinux.KVMContainerLabel()
14+
if err != nil {
15+
return "", err
16+
}
1417
selinux.ReleaseLabel(processLabel)
1518
return swapSELinuxLabel(cLabel, processLabel)
1619
}
@@ -21,7 +24,10 @@ func InitLabel(cLabel string) (string, error) {
2124
// selinux is disabled
2225
return "", nil
2326
}
24-
processLabel, _ := selinux.InitContainerLabels()
27+
processLabel, err := selinux.InitContainerLabel()
28+
if err != nil {
29+
return "", err
30+
}
2531
selinux.ReleaseLabel(processLabel)
2632
return swapSELinuxLabel(cLabel, processLabel)
2733
}

vendor/github.com/opencontainers/selinux/go-selinux/label/label_linux.go

Lines changed: 50 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/selinux/go-selinux/label/label_stub.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/selinux/go-selinux/selinux.go

Lines changed: 68 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)