Date: Fri, 9 Mar 2018 13:40:52 +0900
From: Michael Paquier <michael@paquier.xyz>
To: bianpan2016@163.com, pgsql-bugs@lists.postgresql.org
Cc: Robert Haas <robertmhaas@gmail.com>
Subject: Re: BUG #15105: OpenTransientFile() should be paired with
 CloseTransientFile() rather than close()
Message-ID: <20180309044052.GC1416@paquier.xyz>
References: <152056616579.4966.583293218357089052@wrigleys.postgresql.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="UfEAyuTBtIjiZzX6"
Content-Disposition: inline
In-Reply-To: <152056616579.4966.583293218357089052@wrigleys.postgresql.org>
Precedence: bulk


--UfEAyuTBtIjiZzX6
Content-Type: multipart/mixed; boundary="V88s5gaDVPzZ0KCq"
Content-Disposition: inline


--V88s5gaDVPzZ0KCq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Mar 09, 2018 at 03:29:25AM +0000, PG Bug reporting form wrote:
> Details: The handler opened with OpenTransientFile() should be closed with
> CloseTransientFile(). However, in function dsm_impl_mmap(), on a certain
> path, the return value of OpenTransientFile() (at line 885) is passed to
> close() (at line 926). It is better to use CloseTransientFile() here, as
> done at line 909.

Good catch!  This is visibly a copy-paste error coming from
dsm_impl_posix().  As a patch it gives the attached.  I am adding also
Robert in CC for awareness.
--
Michael

--V88s5gaDVPzZ0KCq
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="dsm-impl-close.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/d=
sm_impl.c
index 67e76b98fe..10a7a56875 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -923,7 +923,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size reques=
t_size,
=20
 		/* Back out what's already been done. */
 		save_errno =3D errno;
-		close(fd);
+		CloseTransientFile(fd);
 		if (op =3D=3D DSM_OP_CREATE)
 			unlink(name);
 		errno =3D save_errno;

--V88s5gaDVPzZ0KCq--

--UfEAyuTBtIjiZzX6
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAlqiEFQACgkQnvQgOdby
QH1eGg/9ESUYmkw+SUxxxIwHnvhUOBIfk2MtQDXwuYOFwDd4jqDGEzBIy0IyKL4/
nCDhckK0iVT0uRWN6BnkelIPV1+cWicwIEBGihOe6ARyxw59X2yMcpgbMQ1eP7X/
hZisiLnajJBwo8qC9uRB+NM9INx+M3dBOCcdpt5Go5qV6cQar0EKzhPywUm77ekb
c42WCkmD4PKOQUeU3WKu4b3DuyoGcIJRo3DU2CI6/dumbZioGx8eHoAZR54fGIS9
xT7EFGvchUHLWecSsqycgz38arii4VyaRiB2XeVDU4Lq4R/c9ZzUryCu+BSEyauB
cZ2rrLLWkWBeqATKlUEaN8oqZ9Olnh3MKmm+fpCG3hXVK4G8mVNx/4LLjQhihIgX
cQZdLLv3w3GPX09rn3gyNe4pYgm+JeCYcEeVOG5TE7wE3AhZjpnQSzwNf7NX4Dw+
cOYo1MkIh9EyyztXKLxVGjl8rCDcdDeG6B5fdQ21Qcq3kQAE7GR+RK1JdngIIDnK
J+cvBbgKtrKrp6zG4hCPCIrlKkVd2OnZ6nzYT2ZihCUUxA+WtTVcmZiuJTxzaFL/
lT5aCuPCalRYPqELYvF2IbwPmF5d8zV/vcTNeQUkAXWOz0iva/sG+PrQnDd5XN1T
KZZKHwxmsFgEzjBye8Dr1aC0hZ+jxHchqtrlsvRsh39dPy9Y7vQ=
=RGvo
-----END PGP SIGNATURE-----

--UfEAyuTBtIjiZzX6--