Skip to content

libct: remove relabeling dead code, deprecate Mount.Relabel #5152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cyphar merged 1 commit into from
Mar 7, 2026
Merged

libct: remove relabeling dead code, deprecate Mount.Relabel #5152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libcontainer/configs/mount_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ type Mount struct {
// Mount data applied to the mount.
Data string `json:"data,omitempty"`

// Relabel source if set, "z" indicates shared, "Z" indicates unshared.
Relabel string `json:"relabel,omitempty"`
Copy link
Copy Markdown
Member

@cyphar cyphar Mar 7, 2026

Choose a reason for hiding this comment

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

Wait, should this have been json:"-"...?

Copy link
Copy Markdown
Contributor Author

@kolyshkin kolyshkin Mar 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

All I can say it was initially added by commit 49951d9. At that time the code was at github.com/docker/libcontainer (and that repo was 4 months old), and I'm not even sure who was the actual or the proposed user (dockerd?).

Copy link
Copy Markdown
Contributor Author

@kolyshkin kolyshkin Mar 10, 2026

Choose a reason for hiding this comment

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

Ah! Right, it should be explicitly omitted at this time.

Copy link
Copy Markdown
Contributor Author

@kolyshkin kolyshkin Mar 10, 2026

Choose a reason for hiding this comment

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

Opened #5160. That one should be included into rc.1 or we'll have a new empty Relabel field in state.json.

// Relabel field is ignored.
//
// Deprecated: do not use. This field will be removed in runc 1.7.
Relabel string

// RecAttr represents mount properties to be applied recursively (AT_RECURSIVE), see mount_setattr(2).
RecAttr *unix.MountAttr `json:"rec_attr,omitempty"`
Expand Down
10 changes: 0 additions & 10 deletions libcontainer/rootfs_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,16 +747,6 @@ func mountToRootfs(c *mountConfig, m mountEntry) error {
return fmt.Errorf("failed to set user-requested vfs flags on bind-mount: %w", err)
}
}

if m.Relabel != "" {
if err := label.Validate(m.Relabel); err != nil {
return err
}
shared := label.IsShared(m.Relabel)
if err := label.Relabel(m.Source, mountLabel, shared); err != nil {
return err
}
}
return setRecAttr(m)
case "cgroup":
if cgroups.IsCgroup2UnifiedMode() {
Expand Down