From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@dev.tarantool.org, tsafin@tarantool.org, gorcunov@gmail.com, alyapunov@tarantool.org Subject: [Tarantool-patches] [PATCH 2/2] uuid: fix unaligned memory access Date: Sat, 16 May 2020 01:03:50 +0200 [thread overview] Message-ID: <172feb69ec2caea2aa63a24de8b76a4dba13bebb.1589583614.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1589583614.git.v.shpilevoy@tarantool.org> Functions tt_uuid_is_nil() and tt_uuid_is_equal() used struct tt_uuid as an array of two uint64. But it is wrong, because struct tt_uuid has 4 byte alignment, while uint64 requires 8. That led to unaligned memory access in these 2 functions. The patch makes these functions treat struct tt_uuid as 4 uint32 instead of 2 uint64. Part of #4609 --- src/lib/uuid/tt_uuid.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/uuid/tt_uuid.h b/src/lib/uuid/tt_uuid.h index c2c436ed4..d62991c65 100644 --- a/src/lib/uuid/tt_uuid.h +++ b/src/lib/uuid/tt_uuid.h @@ -158,8 +158,8 @@ tt_uuid_bswap(struct tt_uuid *uu) inline bool tt_uuid_is_nil(const struct tt_uuid *uu) { - const uint64_t *p = (const uint64_t *) uu; - return !p[0] && !p[1]; + const uint32_t *p = (const uint32_t *) uu; + return p[0] == 0 && p[1] == 0 && p[2] == 0 && p[3] == 0; } /** @@ -172,9 +172,10 @@ tt_uuid_is_nil(const struct tt_uuid *uu) inline bool tt_uuid_is_equal(const struct tt_uuid *lhs, const struct tt_uuid *rhs) { - const uint64_t *lp = (const uint64_t *) lhs; - const uint64_t *rp = (const uint64_t *) rhs; - return lp[0] == rp[0] && lp[1] == rp[1]; + const uint32_t *lp = (const uint32_t *) lhs; + const uint32_t *rp = (const uint32_t *) rhs; + return lp[0] == rp[0] && lp[1] == rp[1] && lp[2] == rp[2] && + lp[3] == rp[3]; } extern const struct tt_uuid uuid_nil; -- 2.21.1 (Apple Git-122.3)
next prev parent reply other threads:[~2020-05-15 23:03 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-15 23:03 [Tarantool-patches] [PATCH 0/2] Sanitize uuid and bit alignment Vladislav Shpilevoy 2020-05-15 23:03 ` [Tarantool-patches] [PATCH 1/2] bit: fix unaligned memory access and UB bit shift Vladislav Shpilevoy 2020-05-21 14:37 ` Timur Safin 2020-05-15 23:03 ` Vladislav Shpilevoy [this message] 2020-05-18 12:55 ` [Tarantool-patches] [PATCH 2/2] uuid: fix unaligned memory access Aleksandr Lyapunov 2020-05-18 21:17 ` Vladislav Shpilevoy 2020-05-19 7:28 ` Aleksandr Lyapunov 2020-05-19 8:34 ` Timur Safin 2020-05-19 21:24 ` Vladislav Shpilevoy 2020-05-20 8:18 ` Aleksandr Lyapunov 2020-05-20 21:38 ` Vladislav Shpilevoy 2020-05-21 8:28 ` Aleksandr Lyapunov 2020-05-21 14:37 ` Timur Safin 2020-05-21 19:33 ` [Tarantool-patches] [PATCH 0/2] Sanitize uuid and bit alignment 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=172feb69ec2caea2aa63a24de8b76a4dba13bebb.1589583614.git.v.shpilevoy@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alyapunov@tarantool.org \ --cc=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=tsafin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/2] uuid: fix unaligned memory access' \ /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