From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com Subject: [PATCH 08/11] coio: fix double close of a file descriptor Date: Fri, 30 Nov 2018 18:39:40 +0300 [thread overview] Message-ID: <a1bf40c47ea240862340686380536358375bc101.1543590433.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1543590433.git.v.shpilevoy@tarantool.org> In-Reply-To: <cover.1543590433.git.v.shpilevoy@tarantool.org> coio_service_on_accept is called by evio by an on_accept pointer. If evio obtains not zero from on_accept pointer, it closes accepted socket. But coio_service_on_accept closes it too, when fiber_new fails. It is double close. Note that the bug existed even when on_accept was able to throw. --- src/coio.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/coio.cc b/src/coio.cc index 575bae712..a888a54dd 100644 --- a/src/coio.cc +++ b/src/coio.cc @@ -605,9 +605,6 @@ coio_service_on_accept(struct evio_service *evio_service, { struct coio_service *service = (struct coio_service *) evio_service->on_accept_param; - struct ev_io coio; - - coio_create(&coio, fd); /* Set connection name. */ char fiber_name[SERVICE_NAME_MAXLEN]; @@ -619,9 +616,10 @@ coio_service_on_accept(struct evio_service *evio_service, if (f == NULL) { diag_log(); say_error("can't create a handler fiber, dropping client connection"); - evio_close(loop(), &coio); return -1; } + struct ev_io coio; + coio_create(&coio, fd); /* * The coio is passed into the created fiber, reset the * libev callback param to point at it. -- 2.17.2 (Apple Git-113)
next prev parent reply other threads:[~2018-11-30 15:39 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-30 15:39 [PATCH 00/11] SWIM preparation Vladislav Shpilevoy 2018-11-30 15:39 ` [PATCH 01/11] box: move info_handler interface into src/info Vladislav Shpilevoy 2018-12-03 11:05 ` Vladimir Davydov 2018-12-03 21:48 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-03 20:41 ` [tarantool-patches] " Konstantin Osipov 2018-12-03 21:48 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-04 8:52 ` Vladimir Davydov 2018-11-30 15:39 ` [PATCH 10/11] evio: remove exceptions Vladislav Shpilevoy 2018-11-30 15:39 ` [PATCH 11/11] evio: turn into C Vladislav Shpilevoy 2018-11-30 15:39 ` [PATCH 02/11] sio: remove unused functions, restyle code Vladislav Shpilevoy 2018-12-03 12:28 ` Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-05 8:41 ` Vladimir Davydov 2018-11-30 15:39 ` [PATCH 03/11] sio: remove exceptions Vladislav Shpilevoy 2018-12-03 12:36 ` Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-05 8:42 ` Vladimir Davydov 2018-11-30 15:39 ` [PATCH 04/11] sio: fix passing negative size_t to sio_add_to_iov Vladislav Shpilevoy 2018-12-03 13:50 ` Vladimir Davydov 2018-12-04 21:29 ` Vladislav Shpilevoy 2018-12-05 8:48 ` Vladimir Davydov 2018-11-30 15:39 ` [PATCH 05/11] sio: turn into C Vladislav Shpilevoy 2018-11-30 15:39 ` [PATCH 06/11] evio: make on_accept be nothrow Vladislav Shpilevoy 2018-12-03 14:58 ` Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-05 8:52 ` Vladimir Davydov 2018-11-30 15:39 ` [PATCH 07/11] coio: fix file descriptor leak on accept Vladislav Shpilevoy 2018-12-03 16:16 ` Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-11-30 15:39 ` Vladislav Shpilevoy [this message] 2018-12-03 16:19 ` [PATCH 08/11] coio: fix double close of a file descriptor Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-11-30 15:39 ` [PATCH 09/11] evio: refactoring Vladislav Shpilevoy 2018-12-03 16:37 ` Vladimir Davydov 2018-12-04 21:29 ` [tarantool-patches] " Vladislav Shpilevoy 2018-12-03 9:47 ` [PATCH 00/11] SWIM preparation Vladimir Davydov 2018-12-03 10:27 ` [tarantool-patches] " Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=a1bf40c47ea240862340686380536358375bc101.1543590433.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH 08/11] coio: fix double close of a file descriptor' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox