From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: "René Scharfe" <l.s.r@web.de>, "Git List" <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH] bswap: convert to unsigned before shifting in get_be32
Date: Sun, 16 Jul 2017 01:23:57 +0100 [thread overview]
Message-ID: <5fd84b40-9dde-0fd2-694c-49a073e87495@ramsayjones.plus.com> (raw)
In-Reply-To: <56f1263c-a0b4-260b-7e23-881e21119041@web.de>
On 15/07/17 20:11, René Scharfe wrote:
> The pointer p is dereferenced and we get an unsigned char. Before
> shifting it's automatically promoted to int. Left-shifting a signed
> 32-bit value bigger than 127 by 24 places is undefined. Explicitly
> convert to a 32-bit unsigned type to avoid undefined behaviour if
> the highest bit is set.
>
> Found with Clang's UBSan.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
> compat/bswap.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/compat/bswap.h b/compat/bswap.h
> index d47c003544..4582c1107a 100644
> --- a/compat/bswap.h
> +++ b/compat/bswap.h
> @@ -166,10 +166,10 @@ static inline uint64_t git_bswap64(uint64_t x)
> (*((unsigned char *)(p) + 0) << 8) | \
> (*((unsigned char *)(p) + 1) << 0) )
> #define get_be32(p) ( \
> - (*((unsigned char *)(p) + 0) << 24) | \
> - (*((unsigned char *)(p) + 1) << 16) | \
> - (*((unsigned char *)(p) + 2) << 8) | \
> - (*((unsigned char *)(p) + 3) << 0) )
> + ((uint32_t)*((unsigned char *)(p) + 0) << 24) | \
> + ((uint32_t)*((unsigned char *)(p) + 1) << 16) | \
> + ((uint32_t)*((unsigned char *)(p) + 2) << 8) | \
> + ((uint32_t)*((unsigned char *)(p) + 3) << 0) )
> #define put_be32(p, v) do { \
> unsigned int __v = (v); \
> *((unsigned char *)(p) + 0) = __v >> 24; \
>
Heh, I have a patch that is pretty much identical. I suspect
you can guess why. ;-)
ATB,
Ramsay Jones
prev parent reply other threads:[~2017-07-16 0:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-15 19:11 [PATCH] bswap: convert to unsigned before shifting in get_be32 René Scharfe
2017-07-15 19:22 ` [PATCH 2/1] bswap: convert get_be16, get_be32 and put_be32 to inline functions René Scharfe
2017-07-16 10:27 ` Jeff King
2017-07-16 10:28 ` Jeff King
2017-07-16 0:23 ` Ramsay Jones [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5fd84b40-9dde-0fd2-694c-49a073e87495@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).