From: Andrzej Hunt <andrzej@ahunt.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Lénaïc Huard" <lenaic@lhuard.fr>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 2/4] SANITIZE tests: fix memory leaks in t13*config*, add to whitelist
Date: Wed, 14 Jul 2021 20:57:37 +0200 [thread overview]
Message-ID: <871ea493-e108-e748-0234-f929690ad2fd@ahunt.org> (raw)
In-Reply-To: <patch-2.4-867e8e9a6c-20210714T172251Z-avarab@gmail.com>
On 14/07/2021 19:23, Ævar Arnfjörð Bjarmason wrote:
> Fix a couple of trivial memory leaks introduced in 3efd0bedc6 (config:
> add conditional include, 2017-03-01) and my own 867ad08a26 (hooks:
> allow customizing where the hook directory is, 2016-05-04).
>
> In the latter case the "fix" is UNLEAK() on the global variable. This
> allows us to run all t13*config* tests under SANITIZE=leak.
>
> With this change we can now run almost the whole set of config.c
> tests (t13*config) under SANITIZE=leak, so let's do so, with a few
> exceptions:
>
> * The test added in ce81b1da23 (config: add new way to pass config
> via `--config-env`, 2021-01-12), it fails in GitHub CI, but passes
> for me locally. Let's just skip it for now.
>
> * Ditto the split_cmdline and "aliases of builtins" tests, the former
> required splitting up an existing test, there an issue with the test
> that would have also been revealed by skipping it.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> config.c | 17 ++++++++++++-----
> t/t1300-config.sh | 16 ++++++++++------
> t/test-lib.sh | 1 +
> 3 files changed, 23 insertions(+), 11 deletions(-)
>
> diff --git a/config.c b/config.c
> index f9c400ad30..38e132c0e2 100644
> --- a/config.c
> +++ b/config.c
> @@ -138,8 +138,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
> return config_error_nonbool("include.path");
>
> expanded = expand_user_path(path, 0);
> - if (!expanded)
> - return error(_("could not expand include path '%s'"), path);
> + if (!expanded) {
> + ret = error(_("could not expand include path '%s'"), path);
> + goto cleanup;
> + }
> path = expanded;
>
> /*
> @@ -149,8 +151,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
> if (!is_absolute_path(path)) {
> char *slash;
>
> - if (!cf || !cf->path)
> - return error(_("relative config includes must come from files"));
> + if (!cf || !cf->path) {
> + ret = error(_("relative config includes must come from files"));
> + goto cleanup;
> + }
>
> slash = find_last_dir_sep(cf->path);
> if (slash)
> @@ -168,6 +172,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
> ret = git_config_from_file(git_config_include, path, inc);
> inc->depth--;
> }
> +cleanup:
> strbuf_release(&buf);
> free(expanded);
> return ret;
> @@ -1331,8 +1336,10 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
> if (!strcmp(var, "core.attributesfile"))
> return git_config_pathname(&git_attributes_file, var, value);
>
> - if (!strcmp(var, "core.hookspath"))
> + if (!strcmp(var, "core.hookspath")) {
> + UNLEAK(git_hooks_path);
> return git_config_pathname(&git_hooks_path, var, value);
> + }
Why is the UNLEAK necessary here? We generally want to limit use of
UNLEAK to cmd_* functions or direct helpers. git_default_core_config()
seems generic enough that it could be called from anywhere, and using
UNLEAK here means we're potentially masking a real leak?
IIUC the leak here happens because:
- git_hooks_path is a global variable - hence it's unlikely we'd ever
bother cleaning it up.
- git_default_core_config() gets called a first time with
core.hookspath, and we end up allocating new memory into
git_hooks_path.
- git_default_core_config() gets called again with core.hookspath,
and we overwrite git_hooks_path with a new string which leaks
the string that git_hooks_path used to point to.
So I think the real fix is to free(git_hooks_path) instead of an UNLEAK?
(Looking at the surrounding code, it looks like the same pattern of leak
might be repeated for other similar globals - is it worth auditing those
while we're here?)
>
> if (!strcmp(var, "core.bare")) {
> is_bare_repository_cfg = git_config_bool(var, value);
> diff --git a/t/t1300-config.sh b/t/t1300-config.sh
> index 9ff46f3b04..93ad0f4887 100755
> --- a/t/t1300-config.sh
> +++ b/t/t1300-config.sh
> @@ -1050,12 +1050,16 @@ test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
> test_must_fail git config --file=linktolinktonada --list
> '
>
> -test_expect_success 'check split_cmdline return' "
> - git config alias.split-cmdline-fix 'echo \"' &&
> - test_must_fail git split-cmdline-fix &&
> +test_expect_success 'setup check split_cmdline return' "
> echo foo > foo &&
> git add foo &&
> - git commit -m 'initial commit' &&
> + git commit -m 'initial commit'
> +"
> +
> +test_expect_success !SANITIZE_LEAK 'check split_cmdline return' "
> + git config alias.split-cmdline-fix 'echo \"' &&
> + test_must_fail git split-cmdline-fix &&
> +
> git config branch.main.mergeoptions 'echo \"' &&
> test_must_fail git merge main
> "
> @@ -1101,7 +1105,7 @@ test_expect_success 'key sanity-checking' '
> git config foo."ba =z".bar false
> '
>
> -test_expect_success 'git -c works with aliases of builtins' '
> +test_expect_success !SANITIZE_LEAK 'git -c works with aliases of builtins' '
> git config alias.checkconfig "-c foo.check=bar config foo.check" &&
> echo bar >expect &&
> git checkconfig >actual &&
> @@ -1397,7 +1401,7 @@ test_expect_success 'git --config-env with missing value' '
> grep "invalid config format: config" error
> '
>
> -test_expect_success 'git --config-env fails with invalid parameters' '
> +test_expect_success !SANITIZE_LEAK 'git --config-env fails with invalid parameters' '
> test_must_fail git --config-env=foo.flag config --bool foo.flag 2>error &&
> test_i18ngrep "invalid config format: foo.flag" error &&
> test_must_fail git --config-env=foo.flag= config --bool foo.flag 2>error &&
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 9201510e16..98e20950c3 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1370,6 +1370,7 @@ maybe_skip_all_sanitize_leak () {
> add_sanitize_leak_true 't000*'
> add_sanitize_leak_true 't001*'
> add_sanitize_leak_true 't006*'
> + add_sanitize_leak_true 't13*config*'
>
> # Blacklist patterns (overrides whitelist)
> add_sanitize_leak_false 't000[469]*'
>
next prev parent reply other threads:[~2021-07-14 18:57 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 14:38 UNLEAK(), leak checking in the default tests etc Ævar Arnfjörð Bjarmason
2021-06-09 17:44 ` Andrzej Hunt
2021-06-09 20:36 ` Felipe Contreras
2021-06-10 10:46 ` Jeff King
2021-06-10 10:56 ` Ævar Arnfjörð Bjarmason
2021-06-10 13:38 ` Jeff King
2021-06-10 15:32 ` Andrzej Hunt
2021-06-10 16:36 ` Jeff King
2021-06-11 15:44 ` Andrzej Hunt
2021-06-10 19:01 ` SZEDER Gábor
2021-07-14 0:11 ` [PATCH 0/4] add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-07-14 0:11 ` [PATCH 1/4] tests: " Ævar Arnfjörð Bjarmason
2021-07-14 3:23 ` Đoàn Trần Công Danh
2021-07-14 0:11 ` [PATCH 2/4] SANITIZE tests: fix memory leaks in t13*config*, add to whitelist Ævar Arnfjörð Bjarmason
2021-07-14 0:11 ` [PATCH 3/4] SANITIZE tests: fix memory leaks in t5701*, " Ævar Arnfjörð Bjarmason
2021-07-14 0:11 ` [PATCH 4/4] SANITIZE tests: fix leak in mailmap.c Ævar Arnfjörð Bjarmason
2021-07-14 2:19 ` Eric Sunshine
2021-07-14 17:23 ` [PATCH v2 0/4] add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-07-14 17:23 ` [PATCH v2 1/4] tests: " Ævar Arnfjörð Bjarmason
2021-07-14 18:42 ` Andrzej Hunt
2021-07-14 22:39 ` Ævar Arnfjörð Bjarmason
2021-07-15 21:14 ` Jeff King
2021-07-15 21:06 ` Jeff King
2021-07-16 14:46 ` Ævar Arnfjörð Bjarmason
2021-07-16 18:09 ` Jeff King
2021-07-16 18:45 ` Jeff King
2021-07-16 18:56 ` Ævar Arnfjörð Bjarmason
2021-07-16 19:22 ` Jeff King
2021-07-14 17:23 ` [PATCH v2 2/4] SANITIZE tests: fix memory leaks in t13*config*, add to whitelist Ævar Arnfjörð Bjarmason
2021-07-14 18:57 ` Andrzej Hunt [this message]
2021-07-14 22:56 ` Ævar Arnfjörð Bjarmason
2021-07-15 21:42 ` Jeff King
2021-07-16 5:18 ` Andrzej Hunt
2021-07-16 21:20 ` Jeff King
2021-07-16 7:46 ` Ævar Arnfjörð Bjarmason
2021-07-16 21:16 ` Jeff King
2021-08-31 12:47 ` Ævar Arnfjörð Bjarmason
2021-09-01 7:53 ` Jeff King
2021-09-01 11:45 ` Ævar Arnfjörð Bjarmason
2021-07-14 17:23 ` [PATCH v2 3/4] SANITIZE tests: fix memory leaks in t5701*, " Ævar Arnfjörð Bjarmason
2021-07-15 17:37 ` Andrzej Hunt
2021-07-15 21:43 ` Jeff King
2021-08-31 13:46 ` [PATCH] protocol-caps.c: fix memory leak in send_info() Ævar Arnfjörð Bjarmason
2021-08-31 15:32 ` Bruno Albuquerque
2021-08-31 18:15 ` Junio C Hamano
[not found] ` <CAPeR6H69a_HMwWnpHzssaCm_ow=ic7AnzMdZVQJQ2ECRDaWzaA@mail.gmail.com>
2021-08-31 20:08 ` Ævar Arnfjörð Bjarmason
2021-07-14 17:23 ` [PATCH v2 4/4] SANITIZE tests: fix leak in mailmap.c Ævar Arnfjörð Bjarmason
2021-08-31 13:42 ` [PATCH] mailmap.c: fix a memory leak in free_mailap_{info,entry}() Ævar Arnfjörð Bjarmason
2021-08-31 16:22 ` Eric Sunshine
2021-08-31 19:38 ` Jeff King
2021-08-31 19:46 ` Junio C Hamano
2021-07-15 17:37 ` [PATCH v2 0/4] add a test mode for SANITIZE=leak, run it in CI Andrzej Hunt
2021-08-31 13:35 ` [PATCH v3 0/8] " Ævar Arnfjörð Bjarmason
2021-09-01 9:56 ` Jeff King
2021-09-01 10:42 ` Jeff King
2021-09-02 12:25 ` Ævar Arnfjörð Bjarmason
2021-09-03 11:13 ` Jeff King
2021-09-07 15:33 ` [PATCH v4 0/3] " Ævar Arnfjörð Bjarmason
2021-09-07 15:33 ` [PATCH v4 1/3] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-09-07 15:33 ` [PATCH v4 2/3] CI: refactor "if" to "case" statement Ævar Arnfjörð Bjarmason
2021-09-07 15:33 ` [PATCH v4 3/3] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-09-07 16:29 ` Eric Sunshine
2021-09-07 16:51 ` Jeff King
2021-09-07 16:44 ` [PATCH v4 0/3] " Jeff King
2021-09-07 18:22 ` Junio C Hamano
2021-09-07 21:30 ` [PATCH v5 " Ævar Arnfjörð Bjarmason
2021-09-07 21:30 ` [PATCH v5 1/3] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-09-07 21:30 ` [PATCH v5 2/3] CI: refactor "if" to "case" statement Ævar Arnfjörð Bjarmason
2021-09-07 21:30 ` [PATCH v5 3/3] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-09-08 4:46 ` Eric Sunshine
2021-09-16 3:56 ` [PATCH] fixup! " Carlo Marcelo Arenas Belón
2021-09-16 6:14 ` Ævar Arnfjörð Bjarmason
2021-09-08 11:02 ` [PATCH v5 0/3] " Junio C Hamano
2021-09-08 12:03 ` Ævar Arnfjörð Bjarmason
2021-09-09 23:10 ` Emily Shaffer
2021-09-16 10:48 ` [PATCH v6 0/2] " Ævar Arnfjörð Bjarmason
2021-09-16 10:48 ` [PATCH v6 1/2] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-09-16 10:48 ` [PATCH v6 2/2] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-09-19 8:03 ` [PATCH v7 0/2] " Ævar Arnfjörð Bjarmason
2021-09-19 8:03 ` [PATCH v7 1/2] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-09-19 8:03 ` [PATCH v7 2/2] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-09-22 11:17 ` [PATCH] fixup! " Carlo Marcelo Arenas Belón
2021-09-23 1:50 ` Ævar Arnfjörð Bjarmason
2021-09-23 9:20 ` [PATCH v8 0/2] " Ævar Arnfjörð Bjarmason
2021-09-23 9:20 ` [PATCH v8 1/2] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-09-23 9:20 ` [PATCH v8 2/2] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-11-03 22:44 ` Re* " Junio C Hamano
2021-11-03 23:57 ` Junio C Hamano
2021-11-04 10:06 ` Ævar Arnfjörð Bjarmason
2021-11-16 18:31 ` [PATCH] t0006: date_mode can leak .strftime_fmt member Ævar Arnfjörð Bjarmason
2021-11-16 19:04 ` Junio C Hamano
2021-11-16 19:31 ` Jeff King
2022-02-02 21:03 ` [PATCH 0/5] date.[ch] API: split from cache.h, add API docs, stop leaking memory Ævar Arnfjörð Bjarmason
2022-02-02 21:03 ` [PATCH 1/5] cache.h: remove always unused show_date_human() declaration Ævar Arnfjörð Bjarmason
2022-02-02 21:03 ` [PATCH 2/5] date API: create a date.h, split from cache.h Ævar Arnfjörð Bjarmason
2022-02-02 21:19 ` Ævar Arnfjörð Bjarmason
2022-02-15 3:04 ` Junio C Hamano
2022-02-02 21:03 ` [PATCH 3/5] date API: provide and use a DATE_MODE_INIT Ævar Arnfjörð Bjarmason
2022-02-02 21:03 ` [PATCH 4/5] date API: add basic API docs Ævar Arnfjörð Bjarmason
2022-02-15 2:14 ` Junio C Hamano
2022-02-02 21:03 ` [PATCH 5/5] date API: add and use a date_mode_release() Ævar Arnfjörð Bjarmason
2022-02-15 0:28 ` Junio C Hamano
2022-02-04 23:53 ` [PATCH v2 0/5] date.[ch] API: split from cache.h, add API docs, stop leaking memory Ævar Arnfjörð Bjarmason
2022-02-04 23:53 ` [PATCH v2 1/5] cache.h: remove always unused show_date_human() declaration Ævar Arnfjörð Bjarmason
2022-02-04 23:53 ` [PATCH v2 2/5] date API: create a date.h, split from cache.h Ævar Arnfjörð Bjarmason
2022-02-04 23:53 ` [PATCH v2 3/5] date API: provide and use a DATE_MODE_INIT Ævar Arnfjörð Bjarmason
2022-02-04 23:53 ` [PATCH v2 4/5] date API: add basic API docs Ævar Arnfjörð Bjarmason
2022-02-04 23:53 ` [PATCH v2 5/5] date API: add and use a date_mode_release() Ævar Arnfjörð Bjarmason
2022-02-14 17:25 ` [PATCH v2 0/5] date.[ch] API: split from cache.h, add API docs, stop leaking memory Ævar Arnfjörð Bjarmason
2022-02-14 19:52 ` Junio C Hamano
2022-02-16 8:14 ` [PATCH v3 " Ævar Arnfjörð Bjarmason
2022-02-16 8:14 ` [PATCH v3 1/5] cache.h: remove always unused show_date_human() declaration Ævar Arnfjörð Bjarmason
2022-02-16 8:14 ` [PATCH v3 2/5] date API: create a date.h, split from cache.h Ævar Arnfjörð Bjarmason
2022-02-16 8:14 ` [PATCH v3 3/5] date API: provide and use a DATE_MODE_INIT Ævar Arnfjörð Bjarmason
2022-02-16 8:14 ` [PATCH v3 4/5] date API: add basic API docs Ævar Arnfjörð Bjarmason
2022-02-16 8:14 ` [PATCH v3 5/5] date API: add and use a date_mode_release() Ævar Arnfjörð Bjarmason
2022-02-16 17:45 ` [PATCH v3 0/5] date.[ch] API: split from cache.h, add API docs, stop leaking memory Junio C Hamano
[not found] ` <cover-v3-0.8-00000000000-20210831T132607Z-avarab@gmail.com>
2021-08-31 13:35 ` [PATCH v3 1/8] Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 2/8] CI: refactor "if" to "case" statement Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 3/8] tests: add a test mode for SANITIZE=leak, run it in CI Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 4/8] tests: annotate t000*.sh with TEST_PASSES_SANITIZE_LEAK=true Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 5/8] tests: annotate t001*.sh " Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 6/8] tests: annotate t002*.sh " Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 7/8] tests: annotate select t0*.sh " Ævar Arnfjörð Bjarmason
2021-08-31 13:35 ` [PATCH v3 8/8] tests: annotate select t*.sh " Ævar Arnfjörð Bjarmason
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=871ea493-e108-e748-0234-f929690ad2fd@ahunt.org \
--to=andrzej@ahunt.org \
--cc=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=dstolee@microsoft.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lenaic@lhuard.fr \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@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).