From: Ben Peart <peartben@gmail.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] read-cache: fix division by zero core-dump
Date: Thu, 27 Sep 2018 21:20:32 -0400 [thread overview]
Message-ID: <8a76234e-fcf8-f435-33e9-1846c3b6ad14@gmail.com> (raw)
In-Reply-To: <476b5678-41b2-d2f8-1890-ba315354ebc0@ramsayjones.plus.com>
On 9/27/2018 6:24 PM, Ramsay Jones wrote:
>
> commit 225df8a468 ("ieot: add Index Entry Offset Table (IEOT)
> extension", 2018-09-26) added a 'DIV_ROUND_UP(entries, ieot_blocks)
> expression, where ieot_blocks was set to zero for a single cpu
> platform. This caused an SIGFPE and a core dump in practically
> every test in the test-suite, until test t4056-diff-order.sh, which
> then went into an infinite loop!
>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Ben,
>
> Could you please squash this into the relevant commits on your
> 'bp/read-cache-parallel' branch. (The first hunk fixes a sparse
> warning about using an integer as a NULL pointer).
>
Absolutely - thanks for the patch.
I don't know how long it's been since I've been on a single core CPU -
I'm sad for you. ;-)
> Thanks!
>
> ATB,
> Ramsay Jones
>
> read-cache.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 6755d58877..40f096f70a 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -2141,7 +2141,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
> size_t extension_offset = 0;
> #ifndef NO_PTHREADS
> int nr_threads, cpus;
> - struct index_entry_offset_table *ieot = 0;
> + struct index_entry_offset_table *ieot = NULL;
> #endif
>
> if (istate->initialized)
> @@ -2771,7 +2771,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
> if (ieot_blocks < 1)
> ieot_blocks = 1;
> cpus = online_cpus();
> - if (ieot_blocks > cpus - 1)
> + if (cpus > 1 && ieot_blocks > cpus - 1)
> ieot_blocks = cpus - 1;
> } else {
> ieot_blocks = nr;
>
next prev parent reply other threads:[~2018-09-28 1:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 22:24 [PATCH] read-cache: fix division by zero core-dump Ramsay Jones
2018-09-28 1:20 ` Ben Peart [this message]
2018-09-28 15:31 ` Ramsay Jones
2018-10-01 12:41 ` Derrick Stolee
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=8a76234e-fcf8-f435-33e9-1846c3b6ad14@gmail.com \
--to=peartben@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsayjones.plus.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).