fix(memlimit): fix mountinfo validation logic for multiple optional fields

KimMachineGun · KimMachineGun · commit e027e7ec771d · 2025-02-23T17:21:57.000+09:00
diff --git a/memlimit/cgroups.go b/memlimit/cgroups.go
@@ -269,11 +269,9 @@ func parseMountInfoLine(line string) (mountInfo, error) {
 		return mountInfo{}, fmt.Errorf("invalid separator")
 	}
 
-	fields1 := strings.Split(fieldss[0], " ")
+	fields1 := strings.SplitN(fieldss[0], " ", 7)
 	if len(fields1) < 6 {
 		return mountInfo{}, fmt.Errorf("not enough fields before separator: %v", fields1)
-	} else if len(fields1) > 7 {
-		return mountInfo{}, fmt.Errorf("too many fields before separator: %v", fields1)
 	} else if len(fields1) == 6 {
 		fields1 = append(fields1, "")
 	}
diff --git a/memlimit/cgroups_test.go b/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 left side",
-			input:   "36 35 98:0 /mnt1 /mnt2 rw,noatime extra master:1 - ext3 /dev/root rw,errors=continue",
-			wantErr: `too many fields before separator: [36 35 98:0 /mnt1 /mnt2 rw,noatime extra master:1]`,
-		},
 		{
 			name:    "too many fields on right side",
 			input:   "36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw extra",
@@ -82,6 +77,16 @@ func TestParseMountInfoLine(t *testing.T) {
 				SuperOptions:   "rw,relatime",
 			},
 		},
+		{
+			name:  "multiple optional fields on left side (issue #26)",
+			input: "465 34 253:0 / / rw,relatime shared:409 master:1 - xfs /dev/mapper/fedora-root rw,seclabel,attr2,inode64,logbufs=8,logbsize=32k,noquota",
+			want: mountInfo{
+				Root:           "/",
+				MountPoint:     "/",
+				FilesystemType: "xfs",
+				SuperOptions:   "rw,seclabel,attr2,inode64,logbufs=8,logbsize=32k,noquota",
+			},
+		},
 	}
 
 	for _, tt := range tests {

Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,9 @@ func parseMountInfoLine(line string) (mountInfo, error) {`
`269`	`269`	`return mountInfo{}, fmt.Errorf("invalid separator")`
`270`	`270`	`}`
`271`	`271`
`272`		`- fields1 := strings.Split(fieldss[0], " ")`
	`272`	`+ fields1 := strings.SplitN(fieldss[0], " ", 7)`
`273`	`273`	`if len(fields1) < 6 {`
`274`	`274`	`return mountInfo{}, fmt.Errorf("not enough fields before separator: %v", fields1)`
`275`		`- } else if len(fields1) > 7 {`
`276`		`- return mountInfo{}, fmt.Errorf("too many fields before separator: %v", fields1)`
`277`	`275`	`} else if len(fields1) == 6 {`
`278`	`276`	`fields1 = append(fields1, "")`
`279`	`277`	`}`