mountinfo: GetMountsFromReader() remove workaround for kernel < 3.10

In Linux <= 3.9 mounting a cifs with spaces in a share name (like "//srv/My Docs") _may_ end up having a space in the last field of mountinfo (like "unc=//serv/My Docs"). Since kernel 3.10-rc1, cifs option "unc=" is ignored, so spaces should not appear. Given that all major distros are now on at least kernel 3.10, and (e.g.) docker has not supported older kernel versions for 5 Years [1], it should be save to remove this special handling. [1]: moby/moby@51b23d8 Signed-off-by: Sebastiaan van Stijn <[email protected]>
moby · Aug 14, 2021 · 8832f96 · 8832f96
1 parent f494bef
commit 8832f96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 83 deletions.
diff --git a/mountinfo/mountinfo_linux.go b/mountinfo/mountinfo_linux.go
@@ -57,18 +57,8 @@ func GetMountsFromReader(r io.Reader, filter FilterFunc) ([]*Info, error) {
 
 		// separator field
 		sepIdx := numFields - 4
-		// In Linux <= 3.9 mounting a cifs with spaces in a share
-		// name (like "//srv/My Docs") _may_ end up having a space
-		// in the last field of mountinfo (like "unc=//serv/My Docs").
-		// Since kernel 3.10-rc1, cifs option "unc=" is ignored,
-		// so spaces should not appear.
-		//
-		// Check for a separator, and work around the spaces bug
-		for fields[sepIdx] != "-" {
-			sepIdx--
-			if sepIdx == 5 {
-				return nil, fmt.Errorf("parsing '%s' failed: missing - separator", text)
-			}
+		if fields[sepIdx] != "-" {
+			return nil, fmt.Errorf("parsing '%s' failed: missing - separator", text)
 		}
 
 		p := &Info{}

diff --git a/mountinfo/mountinfo_linux_test.go b/mountinfo/mountinfo_linux_test.go
@@ -62,8 +62,7 @@ const (
 235 35 253:32 / /var/lib/docker/devicemapper/mnt/1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,relatime shared:217 - ext4 /dev/mapper/docker-253:2-425882-1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,seclabel,discard,stripe=16,data=ordered
 239 35 253:33 / /var/lib/docker/devicemapper/mnt/e9aa60c60128cad1 rw,relatime shared:221 - ext4 /dev/mapper/docker-253:2-425882-e9aa60c60128cad1 rw,seclabel,discard,stripe=16,data=ordered
 243 35 253:34 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,relatime shared:225 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,seclabel,discard,stripe=16,data=ordered
-247 35 253:35 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,relatime shared:229 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,seclabel,discard,stripe=16,data=ordered
-31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1`
+247 35 253:35 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,relatime shared:229 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,seclabel,discard,stripe=16,data=ordered`
 
 	ubuntuMountinfo = `15 20 0:14 / /sys rw,nosuid,nodev,noexec,relatime - sysfs sysfs rw
 16 20 0:3 / /proc rw,nosuid,nodev,noexec,relatime - proc proc rw
@@ -418,10 +417,6 @@ const (
 286 15 0:3631 / /var/lib/docker/aufs/mnt/ff28c27d5f894363993622de26d5dd352dba072f219e4691d6498c19bbbc15a9 rw,relatime - aufs none rw,si=9b4a7642265b339c
 289 15 0:3634 / /var/lib/docker/aufs/mnt/aa128fe0e64fdede333aa48fd9de39530c91a9244a0f0649a3c411c61e372daa rw,relatime - aufs none rw,si=9b4a764012ada39c
 99 15 8:33 / /media/REMOVE\040ME rw,nosuid,nodev,relatime - fuseblk /dev/sdc1 rw,user_id=0,group_id=0,allow_other,blksize=4096`
-
-	mountInfoWithSpaces = `486 28 252:1 / /mnt/foo\040bar rw,relatime shared:243 - ext4 /dev/vda1 rw,data=ordered
-31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1
-649 94 259:5 /tmp/newline\012tab\011space\040backslash\134quote1'quote2" /tmp/newline\012tab\011space\040backslash\134quote1'quote2" rw,relatime shared:47 - ext4 /dev/nvme0n1p5 rw,seclabel`
 )
 
 func TestParseFedoraMountinfo(t *testing.T) {
@@ -454,7 +449,7 @@ func TestParseFedoraMountinfoFields(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expectedLength := 58
+	expectedLength := 57
 	if len(infos) != expectedLength {
 		t.Fatalf("Expected %d entries, got %d", expectedLength, len(infos))
 	}
@@ -504,66 +499,6 @@ func TestParseFedoraMountinfoFilterFields(t *testing.T) {
 	}
 }
 
-func TestParseMountinfoWithSpaces(t *testing.T) {
-	r := bytes.NewBuffer([]byte(mountInfoWithSpaces))
-	infos, err := GetMountsFromReader(r, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := []Info{
-		{
-			ID:         486,
-			Parent:     28,
-			Major:      252,
-			Minor:      1,
-			Root:       "/",
-			Mountpoint: "/mnt/foo bar",
-			Options:    "rw,relatime",
-			Optional:   "shared:243",
-			FSType:     "ext4",
-			Source:     "/dev/vda1",
-			VFSOptions: "rw,data=ordered",
-		},
-		{
-			ID:         31,
-			Parent:     21,
-			Major:      0,
-			Minor:      23,
-			Root:       "/",
-			Mountpoint: "/DATA/foo_bla_bla",
-			Options:    "rw,relatime",
-			Optional:   "",
-			FSType:     "cifs",
-			Source:     `//foo/BLA BLA BLA/`,
-			VFSOptions: `rw,sec=ntlm,cache=loose,unc=\\foo\BLA`,
-		},
-		{
-			ID:     649,
-			Parent: 94,
-			Major:  259,
-			Minor:  5,
-			Root: `/tmp/newline
-tab	space backslash\quote1'quote2"`,
-			Mountpoint: `/tmp/newline
-tab	space backslash\quote1'quote2"`,
-			Options:    "rw,relatime",
-			Optional:   "shared:47",
-			FSType:     "ext4",
-			Source:     `/dev/nvme0n1p5`,
-			VFSOptions: `rw,seclabel`,
-		},
-	}
-
-	if len(infos) != len(expected) {
-		t.Fatalf("expected %d entries, got %d", len(expected), len(infos))
-	}
-	for i, mi := range expected {
-		if *infos[i] != mi {
-			t.Fatalf("expected %#v, got %#v", mi, infos[i])
-		}
-	}
-}
-
 func TestParseMountinfoFilters(t *testing.T) {
 	cases := []struct {
 		filter FilterFunc
@@ -640,10 +575,9 @@ func TestParseMountinfoExtraCases(t *testing.T) {
 			valid: false,
 		},
 		{
-			name:  "extra fields at the end", // which we currently discard
-			entry: `251 15 0:3573 / /mnt/point rw,relatime - aufs none rw,unc=buggy but we cope`,
-			valid: true,
-			exp:   &Info{Mountpoint: "/mnt/point", FSType: "aufs", Source: "none"},
+			name:  "extra fields at the end (kernel < 3.10 bug)",
+			entry: `251 15 0:3573 / /mnt/point rw,relatime - aufs none rw,unc=buggy pre-kernel 3.10 data`,
+			valid: false,
 		},
 		{
 			name:  "one optional field",