Skip to content

Fix mountinfo parsing to handle entries with 10 fields #282

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
pgier merged 1 commit into from
Apr 30, 2020
Merged

Fix mountinfo parsing to handle entries with 10 fields #282

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
2 changes: 1 addition & 1 deletion mountinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func parseMountInfoString(mountString string) (*MountInfo, error) {

mountInfo := strings.Split(mountString, " ")
mountInfoLength := len(mountInfo)
if mountInfoLength < 11 {
if mountInfoLength < 10 {
return nil, fmt.Errorf("couldn't find enough fields in mount string: %s", mountString)
}

Expand Down
32 changes: 32 additions & 0 deletions mountinfo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,38 @@ func TestMountInfo(t *testing.T) {
},
invalid: false,
},
{
name: "Docker overlay with 10 fields (no optional fields)",
s: "137 45 253:2 /lib/docker/overlay2 /var/lib/docker/overlay2 rw,relatime - ext4 /dev/mapper/vg0-lv_var rw,data=ordered",
mount: &MountInfo{
MountID: 137,
ParentID: 45,
MajorMinorVer: "253:2",
Root: "/lib/docker/overlay2",
MountPoint: "/var/lib/docker/overlay2",
Options: map[string]string{"rw": "", "relatime": ""},
OptionalFields: map[string]string{},
FSType: "ext4",
Source: "/dev/mapper/vg0-lv_var",
SuperOptions: map[string]string{"rw": "", "data": "ordered"},
},
},
{
name: "bind chroot bind mount with 10 fields (no optional fields)",
s: "157 47 253:2 /etc/named /var/named/chroot/etc/named rw,relatime - ext4 /dev/mapper/vg0-lv_root rw,data=ordered",
mount: &MountInfo{
MountID: 157,
ParentID: 47,
MajorMinorVer: "253:2",
Root: "/etc/named",
MountPoint: "/var/named/chroot/etc/named",
Options: map[string]string{"rw": "", "relatime": ""},
OptionalFields: map[string]string{},
FSType: "ext4",
Source: "/dev/mapper/vg0-lv_root",
SuperOptions: map[string]string{"rw": "", "data": "ordered"},
},
},
}

for i, test := range tests {
Expand Down