From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] config.c: fix potential number truncation in git_parse_signed()
Date: Fri, 8 Jul 2016 18:01:47 +0200 [thread overview]
Message-ID: <CACsJy8DEC1BqC8q0KDa5ZhCu6zFWemgNWoO-vRT0PgcZ616Svg@mail.gmail.com> (raw)
In-Reply-To: <xmqqa8husgrj.fsf@gitster.mtv.corp.google.com>
On Wed, Jul 6, 2016 at 9:33 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
>
>> clang -Wabsolute-value on IA-32 architecture complains that "absolute
>> value function 'labs' given an argument of type 'intmax_t' (aka 'long
>> long') but has parameter of type 'long' which may cause truncation of
>> value". Very unlikely for this code though. Nevertheless, add an
>> explicit check for truncation to shut clang up and error out.
>
> Thanks. It however makes me wonder if it is a better approach to
> avoid downcasting intmax_t to long by using imaxabs()?
I think the tricky part is detect overflow. WIth uval being a
potentially signed number, i'm not sure how to catch it. The (uval >
max || labs(val) > uval) was written with unsigned number in mind, I
think.
>
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>> config.c | 10 ++++++++--
>> 1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/config.c b/config.c
>> index d7ce34b..880bd4a 100644
>> --- a/config.c
>> +++ b/config.c
>> @@ -503,6 +503,7 @@ static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
>> intmax_t val;
>> uintmax_t uval;
>> uintmax_t factor = 1;
>> + long int lival;
>>
>> errno = 0;
>> val = strtoimax(value, &end, 0);
>> @@ -512,9 +513,14 @@ static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
>> errno = EINVAL;
>> return 0;
>> }
>> - uval = labs(val);
>> + lival = (long int)val;
>> + if (lival != val) {
>> + errno = ERANGE;
>> + return 0;
>> + }
>> + uval = labs(lival);
>> uval *= factor;
>> - if (uval > max || labs(val) > uval) {
>> + if (uval > max || labs(lival) > uval) {
>> errno = ERANGE;
>> return 0;
>> }
--
Duy
prev parent reply other threads:[~2016-07-08 16:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-02 13:13 [PATCH] config.c: fix potential number truncation in git_parse_signed() Nguyễn Thái Ngọc Duy
2016-07-06 19:33 ` Junio C Hamano
2016-07-08 16:01 ` Duy Nguyen [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=CACsJy8DEC1BqC8q0KDa5ZhCu6zFWemgNWoO-vRT0PgcZ616Svg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).