Merge branch 'john/erts/fix-read_file_info-crash/OTP-15196/ERL-674' into maint-21

* john/erts/fix-read_file_info-crash/OTP-15196/ERL-674:
  Fix node crash on passing bad arguments to file:read_file_info/2

3 files changed, 17 insertions, 8 deletions

diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index f375c05c99..3316e4348c 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 41ff38359c..517ca74301 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -580,15 +580,20 @@ read_link_info(Name, Opts) ->
     read_info_1(Name, 0, proplist_get_value(time, Opts, local)).
 
 read_info_1(Name, FollowLinks, TimeType) ->
-    try read_info_nif(encode_path(Name), FollowLinks) of
-        {error, Reason} -> {error, Reason};
-        FileInfo ->
-            CTime = from_posix_seconds(FileInfo#file_info.ctime, TimeType),
-            MTime = from_posix_seconds(FileInfo#file_info.mtime, TimeType),
-            ATime = from_posix_seconds(FileInfo#file_info.atime, TimeType),
-            {ok, FileInfo#file_info{ ctime = CTime, mtime = MTime, atime = ATime }}
+    try
+        case read_info_nif(encode_path(Name), FollowLinks) of
+            {error, Reason} ->
+                {error, Reason};
+            FileInfo ->
+                CTime = from_posix_seconds(FileInfo#file_info.ctime, TimeType),
+                MTime = from_posix_seconds(FileInfo#file_info.mtime, TimeType),
+                ATime = from_posix_seconds(FileInfo#file_info.atime, TimeType),
+                {ok, FileInfo#file_info{ ctime = CTime,
+                                         mtime = MTime,
+                                         atime = ATime }}
+        end
     catch
-        error:badarg -> {error, badarg}
+        error:_ -> {error, badarg}
     end.
 
 write_file_info(Filename, Info) ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 23913ac56a..e784c06865 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -1367,6 +1367,10 @@ file_info_basic_file(Config) when is_list(Config) ->
     io:put_chars(Fd1, "foo bar"),
     ok = ?FILE_MODULE:close(Fd1),
 
+    %% Don't crash the file server when passing incorrect arguments.
+    {error,badarg} = ?FILE_MODULE:read_file_info(Name, [{time, gurka}]),
+    {error,badarg} = ?FILE_MODULE:read_file_info([#{} | gaffel]),
+
     %% Test that the file has the expected attributes.
     %% The times are tricky, so we will save them to a separate test case.
     {ok,FileInfo} = ?FILE_MODULE:read_file_info(Name),