From 0de8b6897b15b9ee881b42ad96b0720f9c17b556 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 29 Mar 2017 11:50:06 +0200
Subject: Close FD after trying to open a directory

---
 erts/emulator/drivers/unix/unix_efile.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'erts')

diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index 3ff68a8859..0acc2432a7 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -430,6 +430,9 @@ efile_openfile(Efile_error* errInfo,	/* Where to return error codes. */
         if ( (stat("/dev/null", &nullstatbuf) < 0)
              || (statbuf.st_ino != nullstatbuf.st_ino)
              || (statbuf.st_dev != nullstatbuf.st_dev) ) {
+#ifdef HAVE_FSTAT
+            efile_closefile(fd);
+#endif
 	    errno = EISDIR;
 	    return check_error(-1, errInfo);
         }
-- 
cgit v1.2.3


From 71f7e9155c4867f4e8036704337c21127f508dfb Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 31 Mar 2017 12:58:36 +0200
Subject: Update version numbers

---
 erts/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/vsn.mk b/erts/vsn.mk
index ab39cb45ed..7f880dba49 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 8.3
+VSN = 8.3.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3


From 19427107ca9305a931dcaea8c2134017aa385fbd Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 31 Mar 2017 12:59:07 +0200
Subject: Update release notes

---
 erts/doc/src/notes.xml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 470491a193..d9c5f47a3a 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,37 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 8.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trying to open a directory with file:read_file/1 on Unix
+	    leaked a file descriptor. This bug has now been fixed.</p>
+          <p>
+	    Own Id: OTP-14308 Aux Id: ERL-383 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Invoking <c>init:stop/0</c> via the SIGTERM signal, in a
+	    non-SMP BEAM, could cause BEAM to terminate with fatal
+	    error. This has now been fixed and the BEAM will
+	    terminate normally when SIGTERM is received.</p>
+          <p>
+	    Own Id: OTP-14290</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3