Skip to content

Commit

Permalink
fix: mountinfo parsing (#73)
Browse files Browse the repository at this point in the history
Fix the parsing of mountinfo when super options has fields with spaces
in, which is the case on WSL as it includes path=C:\\Program Files\...

Fixes #72
  • Loading branch information
stevenh authored Jul 19, 2023
1 parent d064ede commit 60f2278
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
4 changes: 4 additions & 0 deletions internal/cgroups/mountpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,12 @@ func NewMountPointFromLine(line string) (*MountPoint, error) {

for i, field := range fields[_miFieldIDOptionalFields:] {
if field == _mountInfoOptionalFieldsSep {
// End of optional fields.
fsTypeStart := _miFieldIDOptionalFields + i + 1

// Now we know where the optional fields end, split the line again with a
// limit to avoid issues with spaces in super options as present on WSL.
fields = strings.SplitN(line, _mountInfoSep, fsTypeStart+_miFieldCountSecondHalf)
if len(fields) != fsTypeStart+_miFieldCountSecondHalf {
return nil, mountPointFormatInvalidError{line}
}
Expand Down
29 changes: 27 additions & 2 deletions internal/cgroups/mountpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,37 @@ func TestNewMountPointFromLine(t *testing.T) {
SuperOptions: []string{"rw", "cpu"},
},
},
{
name: "wsl",
line: `560 77 0:138 / /Docker/host rw,noatime - 9p drvfs rw,dirsync,aname=drvfs;path=C:\Program Files\Docker\Docker\resources;symlinkroot=/mnt/,mmap,access=client,msize=262144,trans=virtio`,
expected: &MountPoint{
MountID: 560,
ParentID: 77,
DeviceID: "0:138",
Root: "/",
MountPoint: "/Docker/host",
Options: []string{"rw", "noatime"},
OptionalFields: []string{},
FSType: "9p",
MountSource: "drvfs",
SuperOptions: []string{
"rw",
"dirsync",
`aname=drvfs;path=C:\Program Files\Docker\Docker\resources;symlinkroot=/mnt/`,
"mmap",
"access=client",
"msize=262144",
"trans=virtio",
},
},
},
}

for _, tt := range testTable {
mountPoint, err := NewMountPointFromLine(tt.line)
assert.Equal(t, tt.expected, mountPoint, tt.name)
assert.NoError(t, err, tt.name)
if assert.NoError(t, err, tt.name) {
assert.Equal(t, tt.expected, mountPoint, tt.name)
}
}
}

Expand Down

0 comments on commit 60f2278

Please sign in to comment.