path: root/scripts/
diff options
authorThierry Reding <>2018-12-14 14:17:24 -0800
committerLinus Torvalds <>2018-12-14 15:05:45 -0800
commit3a6ab5c7dc114057fd67750e308e1745dafc0e6a (patch)
tree9ef923539d2117b4859921fa890d50e93771eea5 /scripts/
parentf1733a1d3cd32a9492f4cf866be37bb46e10163d (diff)
scripts/ always open files in binary mode
The spdxcheck script currently falls over when confronted with a binary file (such as Documentation/logo.gif). To avoid that, always open files in binary mode and decode line-by-line, ignoring encoding errors. One tricky case is when piping data into the script and reading it from standard input. By default, standard input will be opened in text mode, so we need to reopen it in binary mode. The breakage only happens with python3 and results in a UnicodeDecodeError (according to Uwe). Link: Fixes: 6f4d29df66ac ("scripts/ make python3 compliant") Signed-off-by: Thierry Reding <> Reviewed-by: Jeremy Cline <> Cc: Thomas Gleixner <> Cc: Jonathan Corbet <> Cc: Joe Perches <> Cc: Uwe Kleine-K├Ânig <> Cc: <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'scripts/')
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/ b/scripts/
index 5056fb3b897d..e559c6294c39 100755
--- a/scripts/
+++ b/scripts/
@@ -168,6 +168,7 @@ class id_parser(object):
self.curline = 0
for line in fd:
+ line = line.decode(locale.getpreferredencoding(False), errors='ignore')
self.curline += 1
if self.curline > maxlines:
@@ -249,12 +250,13 @@ if __name__ == '__main__':
if len(args.path) and args.path[0] == '-':
- parser.parse_lines(sys.stdin, args.maxlines, '-')
+ stdin = os.fdopen(sys.stdin.fileno(), 'rb')
+ parser.parse_lines(stdin, args.maxlines, '-')
if args.path:
for p in args.path:
if os.path.isfile(p):
- parser.parse_lines(open(p), args.maxlines, p)
+ parser.parse_lines(open(p, 'rb'), args.maxlines, p)
elif os.path.isdir(p):
scan_git_subtree(repo.head.reference.commit.tree, p)