mountinfo: also unescape fstype and source

kolyshkin · kolyshkin · commit 0b171c288ece · 2020-06-23T14:12:13.000-07:00
Just noticed it while reading the kernel source code (function
show_mountinfo() in fs/proc_namespace.c; see also: show_type(),
mangle()) that the first two fields after the `-` separator are also
escaped.

While I haven't seen it in real life, it's better we unescape them.

No field-specific tests were added, and unescape() is tested by its own
test case.

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/mountinfo/mountinfo_linux.go b/mountinfo/mountinfo_linux.go
@@ -75,8 +75,14 @@ func parseInfoFile(r io.Reader, filter FilterFunc) ([]*Info, error) {
 		if err != nil {
 			return nil, fmt.Errorf("Parsing '%s' failed: mount point: %w", fields[4], err)
 		}
-		p.Fstype = fields[sepIdx+1]
-		p.Source = fields[sepIdx+2]
+		p.Fstype, err = unescape(fields[sepIdx+1])
+		if err != nil {
+			return nil, fmt.Errorf("Parsing '%s' failed: fstype: %w", fields[sepIdx+1], err)
+		}
+		p.Source, err = unescape(fields[sepIdx+2])
+		if err != nil {
+			return nil, fmt.Errorf("Parsing '%s' failed: source: %w", fields[sepIdx+2], err)
+		}
 		p.VfsOpts = fields[sepIdx+3]
 
 		// Run a filter soon so we can skip parsing/adding entries
