From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, kyukhin@tarantool.org Subject: [Tarantool-patches] [PATCH 13/15] sio: increase SERVICE_NAME_MAXLEN size Date: Wed, 24 Mar 2021 22:24:25 +0100 [thread overview] Message-ID: <8abe8bf4cd3e7ff728d42c3b93d4f5de650f37be.1616620860.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1616620860.git.v.shpilevoy@tarantool.org> It was 32, and couldn't fit long IPv6 and Unix socket addresses. The patch makes it 200 so now it fits any supported addresses family used in the code. Having SERVICE_NAME_MAXLEN valid is necessary to be able to save a complete address string on the stack in the places where the static buffer returned by sio_strfaddr() can't be used safely. For instance, in the code working with Lua due to Lua GC which might be invoked any moment and in a __gc handler could overwrite the static buffer. Needed for #5632 (cherry picked from commit 6b331f7a78aa409ad68ffc8ceb3deb3733a32473) --- src/sio.cc | 2 +- src/sio.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/sio.cc b/src/sio.cc index 0ba19346c..a425b8383 100644 --- a/src/sio.cc +++ b/src/sio.cc @@ -81,7 +81,7 @@ sio_socketname(int fd) { /* Preserve errno */ int save_errno = errno; - static __thread char name[2 * SERVICE_NAME_MAXLEN]; + static __thread char name[SERVICE_NAME_MAXLEN]; int rc = sio_socketname_to_buffer(fd, name, sizeof(name)); /* * Could fail only because of a bad format in snprintf, but it is not diff --git a/src/sio.h b/src/sio.h index f728af547..3b91f7eee 100644 --- a/src/sio.h +++ b/src/sio.h @@ -46,7 +46,16 @@ extern "C" { #endif /* defined(__cplusplus) */ -enum { SERVICE_NAME_MAXLEN = 32 }; +enum { + /** + * - Unix socket path is 108 bytes max; + * - IP(v4, v6) max string len is 45; + * + * Max result is rounded up just in case the numbers are a bit different + * on various platforms. + */ + SERVICE_NAME_MAXLEN = 200, +}; const char * sio_strfaddr(struct sockaddr *addr, socklen_t addrlen); -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-03-24 21:27 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-24 21:24 [Tarantool-patches] [PATCH 00/15] Cord buffer, static alloc, and Lua GC bug for 1.10 Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 01/15] fio: don't use shared buffer in pread() Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 10/15] uri: replace static_alloc with ffi stash and ibuf Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 11/15] lua: use lua_pushfstring() instead of tt_sprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 12/15] sio: rework sio_strfaddr() Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 14/15] sio: introduce and use sio_snprintf() Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 15/15] buffer: remove Lua registers Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 02/15] test: don't use IBUF_SHARED in the tests Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 03/15] tuple: pass global ibuf explicitly where possible Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 04/15] iconv: take errno before reseting the context Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 05/15] cord_buf: introduce cord_buf API Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 06/15] cord_buf: introduce ownership management Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 07/15] buffer: implement ffi stash Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 08/15] uuid: replace static_alloc with " Vladislav Shpilevoy via Tarantool-patches 2021-03-24 21:24 ` [Tarantool-patches] [PATCH 09/15] uuid: drop tt_uuid_str() from Lua Vladislav Shpilevoy via Tarantool-patches 2021-03-29 15:41 ` [Tarantool-patches] [PATCH 00/15] Cord buffer, static alloc, and Lua GC bug for 1.10 Kirill Yukhin via Tarantool-patches
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=8abe8bf4cd3e7ff728d42c3b93d4f5de650f37be.1616620860.git.v.shpilevoy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=kyukhin@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 13/15] sio: increase SERVICE_NAME_MAXLEN size' \ /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