modules, mountinfo: check scanner.Err after scanner.Scan

Check for any non-EOF errors after `scanner.Scan`. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
cilium · Mar 26, 2020 · a457b0c · a457b0c
1 parent 5ff7c51
commit a457b0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/modules/modules_linux.go b/pkg/modules/modules_linux.go
@@ -49,6 +49,10 @@ func parseModulesFile(r io.Reader) ([]string, error) {
 		result = append(result, moduleInfoSeparated[0])
 	}
 
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
 	return result, nil
 }
 

diff --git a/pkg/mountinfo/mountinfo.go b/pkg/mountinfo/mountinfo.go
@@ -110,6 +110,10 @@ func parseMountInfoFile(r io.Reader) ([]*MountInfo, error) {
 		})
 	}
 
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
 	return result, nil
 }