Skip to content

Update module github.com/opencontainers/selinux to v1.14.1#841

Merged
mtrmac merged 2 commits into
containers:mainfrom
kolyshkin:selinux
May 12, 2026
Merged

Update module github.com/opencontainers/selinux to v1.14.1#841
mtrmac merged 2 commits into
containers:mainfrom
kolyshkin:selinux

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

This is an alternative to #823.

NOTE we deliberately ignore selinux.ErrMCSAlreadyExists from
selinux.ReserveLabelV2 in storage, because we are not interested in
whether the label is unique -- we are interested in label being
reserved.

kolyshkin added 2 commits May 11, 2026 16:45
common/pkg/config/default.go uses selinuxEnabled wrapper which is no
longer needed since on !linux selinux.GetEnabled always returns false.

Besides, common/pkg/config/default.go already calls selinux.GetEnabled
directly in another place (SecurityOptions) for quite some time.

Remove the wrapper.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
NOTE we deliberately ignore selinux.ErrMCSAlreadyExists from
selinux.ReserveLabelV2 in storage, because we are not interested in
whether the label is unique -- we are interested in label being
reserved.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@github-actions github-actions Bot added storage Related to "storage" package common Related to "common" package image Related to "image" package labels May 12, 2026
Copy link
Copy Markdown
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

(I don’t have much of an opinion on correctness of the ErrMCSAlreadyExists logic, but at least it is equivalent to what we have now.)

@mtrmac mtrmac merged commit 40dac52 into containers:main May 12, 2026
35 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package image Related to "image" package storage Related to "storage" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants