fix(memlimit): fix mountinfo validation logic when super options have spaces

Author: KimMachineGun

memlimit/cgroups.go

@@ -276,11 +276,9 @@ func parseMountInfoLine(line string) (mountInfo, error) {
 		fields1 = append(fields1, "")
 	}
 
-	fields2 := strings.Split(fieldss[1], " ")
+	fields2 := strings.SplitN(fieldss[1], " ", 3)
 	if len(fields2) < 3 {
 		return mountInfo{}, fmt.Errorf("not enough fields after separator: %v", fields2)
-	} else if len(fields2) > 3 {
-		return mountInfo{}, fmt.Errorf("too many fields after separator: %v", fields2)
 	}
 
 	return mountInfo{

memlimit/cgroups_test.go

@@ -57,11 +57,6 @@ func TestParseMountInfoLine(t *testing.T) {
 			input:   "36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3",
 			wantErr: `not enough fields after separator: [ext3]`,
 		},
-		{
-			name:    "too many fields on right side",
-			input:   "36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw extra",
-			wantErr: `too many fields after separator: [ext3 /dev/root rw extra]`,
-		},
 		{
 			name:    "empty line",
 			input:   "",
@@ -87,6 +82,16 @@ func TestParseMountInfoLine(t *testing.T) {
 				SuperOptions:   "rw,seclabel,attr2,inode64,logbufs=8,logbsize=32k,noquota",
 			},
 		},
+		{
+			name:    "super options have spaces (issue #28)",
+			input:   `1391 1160 0:151 / /Docker/host rw,noatime - 9p C:\134Program\040Files\134Docker\134Docker\134resources rw,dirsync,aname=drvfs;path=C:\Program Files\Docker\Docker\resources;symlinkroot=/mnt/,mmap,access=client,msize=65536,trans=fd,rfd=3,wfd=3`,
+			want: mountInfo{
+				Root:           "/",
+				MountPoint:     "/Docker/host",
+				FilesystemType: "9p",
+				SuperOptions:   `rw,dirsync,aname=drvfs;path=C:\Program Files\Docker\Docker\resources;symlinkroot=/mnt/,mmap,access=client,msize=65536,trans=fd,rfd=3,wfd=3`,
+			},
+		},
 	}
 
 	for _, tt := range tests {