0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #42253 from AkihiroSuda/btrfs-allow-unprivileged-20.10

Browse source 
[20.10 backport] btrfs: Allow unprivileged user to delete subvolumes (kernel >= 4.18)
This commit is contained in:
Tibor Vass 2021-04-07 16:55:56 -07:00 committed by GitHub
commit ffd037de36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/graphdriver/btrfs/btrfs.go
View file

@ -633,7 +633,14 @@ func (d *Driver) Remove(id string) error {
d.updateQuotaStatus()
if err := subvolDelete(d.subvolumesDir(), id, d.quotaEnabled); err != nil {
return err
if d.quotaEnabled {
return err
}
// If quota is not enabled, fallback to rmdir syscall to delete subvolumes.
// This would allow unprivileged user to delete their owned subvolumes
// in kernel >= 4.18 without user_subvol_rm_allowed mount option.
//
// From https://github.com/containers/storage/pull/508/commits/831e32b6bdcb530acc4c1cb9059d3c6dba14208c
}
if err := system.EnsureRemoveAll(dir); err != nil {
return err