From: Thomas Rast <tr@thomasrast.ch>
To: Karsten Blees <karsten.blees@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v3 10/11] read-cache.c: fix memory leaks caused by removed cache entries
Date: Sat, 19 Oct 2013 21:28:51 +0200 [thread overview]
Message-ID: <8738nx2h70.fsf@thomasrast.ch> (raw)
In-Reply-To: <524A9886.2030508@gmail.com> (Karsten Blees's message of "Tue, 01 Oct 2013 11:40:22 +0200")
Karsten Blees <karsten.blees@gmail.com> writes:
> When cache_entry structs are removed from index_state.cache, they are not
> properly freed. Freeing those entries wasn't possible before because we
> couldn't remove them from index_state.name_hash.
>
> Now that we _do_ remove the entries from name_hash, we can also free them.
> Add free(cache_entry) to all call sites of name-hash.c::remove_name_hash in
> read-cache.c, as name-hash.c isn't concerned with cache_entry allocation.
>
> cmd_rm and unmerge_index_entry_at use cache_entry.name after removing the
> entry. Copy the name so that we don't access memory that has been freed.
Is this the version that is currently in pu? There's a valgrind test
failure in current pu that bisects to 36850edb, which would seem to be
from this email but doesn't have the right author date. Worse, I cannot
apply this on top of 36850edb^ because I don't have the 'index' blobs
for this patch. Confusing.
In any case 36850edb currently breaks several valgrind tests. You can
valgrind only t6022.16 like so (that one test is sufficient to track it
down and it's much faster that way):
cd t
./t6022-merge-rename.sh --valgrind-only=16
The valgrind error in t6022.16 looks like this:
==4959== Invalid read of size 1
==4959== at 0x5682A38: vfprintf (vfprintf.c:1629)
==4959== by 0x56AC564: vsnprintf (vsnprintf.c:119)
==4959== by 0x542005: vreportf (usage.c:12)
==4959== by 0x54216C: error_builtin (usage.c:42)
==4959== by 0x54261B: error (usage.c:147)
==4959== by 0x4FC681: read_index_unmerged (read-cache.c:1900)
==4959== by 0x475CF1: reset_index (reset.c:68)
==4959== by 0x476A72: cmd_reset (reset.c:346)
==4959== by 0x405999: run_builtin (git.c:314)
==4959== by 0x405B2C: handle_internal_command (git.c:477)
==4959== by 0x405C46: run_argv (git.c:523)
==4959== by 0x405DE2: main (git.c:606)
==4959== Address 0x5bedb54 is 84 bytes inside a block of size 104 free'd
==4959== at 0x4C2ACDA: free (vg_replace_malloc.c:468)
==4959== by 0x4F9360: remove_index_entry_at (read-cache.c:482)
==4959== by 0x4FA469: add_index_entry_with_check (read-cache.c:964)
==4959== by 0x4FA5A4: add_index_entry (read-cache.c:993)
==4959== by 0x4FC663: read_index_unmerged (read-cache.c:1899)
==4959== by 0x475CF1: reset_index (reset.c:68)
==4959== by 0x476A72: cmd_reset (reset.c:346)
==4959== by 0x405999: run_builtin (git.c:314)
==4959== by 0x405B2C: handle_internal_command (git.c:477)
==4959== by 0x405C46: run_argv (git.c:523)
==4959== by 0x405DE2: main (git.c:606)
If you need any more information/help, just ask :-)
--
Thomas Rast
tr@thomasrast.ch
next prev parent reply other threads:[~2013-10-19 19:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 9:33 [PATCH v3 00/11] New hash table implementation Karsten Blees
2013-10-01 9:34 ` [PATCH v3 01/11] add a hashtable implementation that supports O(1) removal Karsten Blees
2013-10-01 9:35 ` [PATCH v3 02/11] buitin/describe.c: use new hash map implementation Karsten Blees
2013-10-01 9:36 ` [PATCH v3 03/11] diffcore-rename.c: move code around to prepare for the next patch Karsten Blees
2013-10-01 9:36 ` [PATCH v3 04/11] diffcore-rename.c: simplify finding exact renames Karsten Blees
2013-10-01 9:37 ` [PATCH v3 05/11] diffcore-rename.c: use new hash map implementation Karsten Blees
2013-10-01 9:37 ` [PATCH v3 06/11] name-hash.c: use new hash map implementation for directories Karsten Blees
2013-10-01 9:38 ` [PATCH v3 07/11] name-hash.c: remove unreferenced directory entries Karsten Blees
2013-10-01 9:39 ` [PATCH v3 08/11] name-hash.c: use new hash map implementation for cache entries Karsten Blees
2013-10-01 9:39 ` [PATCH v3 09/11] name-hash.c: remove cache entries instead of marking them CE_UNHASHED Karsten Blees
2013-10-01 9:40 ` [PATCH v3 10/11] read-cache.c: fix memory leaks caused by removed cache entries Karsten Blees
2013-10-19 19:28 ` Thomas Rast [this message]
2013-10-22 13:13 ` [PATCH] fixup! read-cache.c: fix memory leaks caused by removed cache, entries Karsten Blees
2013-10-01 9:40 ` [PATCH v3 11/11] remove old hash.[ch] implementation Karsten Blees
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=8738nx2h70.fsf@thomasrast.ch \
--to=tr@thomasrast.ch \
--cc=git@vger.kernel.org \
--cc=karsten.blees@gmail.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.
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 NNTP newsgroup(s).