threads / patch / 58346

v2pathspec: fix memleak

Subject: [PATCH v2 0/1] pathspec: fix memleak

## tl;dr

3 messages between Aug 22, 2022 and Aug 22, 2022. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Anthony Delannoy· Aug 22, 2022, 21:15 UTC · lore
Changes since v1:
- use directly clear_pathspec() function instead of multiple free()

Sending this patch to fix a memleak, created with copy_pathspec, found thanks to the address sanitizer.

Thanks
Anthony Delannoy (1):
  pathspec: fix memleak
 preload-index.c | 6 ++++++
 1 file changed, 6 insertions(+)

base-commit: 795ea8776befc95ea2becd8020c7a284677b4161 -- 2.35.1

Anthony Delannoy· Aug 22, 2022, 21:15 UTC · re: Anthony Delannoy · lore

[PATCH v2 1/1] pathspec: fix memleak

Fix a memory leak occuring in case of pathspec copy in preload_index.
Direct leak of 8 byte(s) in 8 object(s) allocated from:
    #0 0x7f0a353ead47 in __interceptor_malloc (/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/libasan.so.6+0xb5d47)
    #1 0x55750995e840 in do_xmalloc /home/anthony/src/c/git/wrapper.c:51
    #2 0x55750995e840 in xmalloc /home/anthony/src/c/git/wrapper.c:72
    #3 0x55750970f824 in copy_pathspec /home/anthony/src/c/git/pathspec.c:684
    #4 0x557509717278 in preload_index /home/anthony/src/c/git/preload-index.c:135
    #5 0x55750975f21e in refresh_index /home/anthony/src/c/git/read-cache.c:1633
    #6 0x55750915b926 in cmd_status builtin/commit.c:1547
    #7 0x5575090e1680 in run_builtin /home/anthony/src/c/git/git.c:466
    #8 0x5575090e1680 in handle_builtin /home/anthony/src/c/git/git.c:720
    #9 0x5575090e284a in run_argv /home/anthony/src/c/git/git.c:787
    #10 0x5575090e284a in cmd_main /home/anthony/src/c/git/git.c:920
    #11 0x5575090dbf82 in main /home/anthony/src/c/git/common-main.c:56
    #12 0x7f0a348230ab  (/lib64/libc.so.6+0x290ab)
Signed-off-by: Anthony Delannoy <anthony.2lannoy@gmail.com>
---
 preload-index.c | 6 ++++++
 1 file changed, 6 insertions(+)
Show changes to preload-index.c +6 −0
diff --git a/preload-index.c b/preload-index.c
index e5529a5863..100f7a374d 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -151,6 +151,12 @@ void preload_index(struct index_state *index,
 	}
 	stop_progress(&pd.progress);
 
+	if (pathspec) {
+		/* earlier we made deep copies for each thread to work with */
+		for (i = 0; i < threads; i++)
+			clear_pathspec(&data[i].pathspec);
+	}
+
 	trace_performance_leave("preload index");
 
 	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);

-- 
2.35.1
Junio C Hamano· Aug 22, 2022, 21:41 UTC · re: Anthony Delannoy · lore

Re: [PATCH v2 1/1] pathspec: fix memleak

Anthony Delannoy <anthony.2lannoy@gmail.com> writes:
Show 36 quoted lines
> Fix a memory leak occuring in case of pathspec copy in preload_index.
>
> Direct leak of 8 byte(s) in 8 object(s) allocated from:
>     #0 0x7f0a353ead47 in __interceptor_malloc (/usr/lib/gcc/x86_64-pc-linux-gnu/11.3.0/libasan.so.6+0xb5d47)
>     #1 0x55750995e840 in do_xmalloc /home/anthony/src/c/git/wrapper.c:51
>     #2 0x55750995e840 in xmalloc /home/anthony/src/c/git/wrapper.c:72
>     #3 0x55750970f824 in copy_pathspec /home/anthony/src/c/git/pathspec.c:684
>     #4 0x557509717278 in preload_index /home/anthony/src/c/git/preload-index.c:135
>     #5 0x55750975f21e in refresh_index /home/anthony/src/c/git/read-cache.c:1633
>     #6 0x55750915b926 in cmd_status builtin/commit.c:1547
>     #7 0x5575090e1680 in run_builtin /home/anthony/src/c/git/git.c:466
>     #8 0x5575090e1680 in handle_builtin /home/anthony/src/c/git/git.c:720
>     #9 0x5575090e284a in run_argv /home/anthony/src/c/git/git.c:787
>     #10 0x5575090e284a in cmd_main /home/anthony/src/c/git/git.c:920
>     #11 0x5575090dbf82 in main /home/anthony/src/c/git/common-main.c:56
>     #12 0x7f0a348230ab  (/lib64/libc.so.6+0x290ab)
>
> Signed-off-by: Anthony Delannoy <anthony.2lannoy@gmail.com>
> ---
>  preload-index.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/preload-index.c b/preload-index.c
> index e5529a5863..100f7a374d 100644
> --- a/preload-index.c
> +++ b/preload-index.c
> @@ -151,6 +151,12 @@ void preload_index(struct index_state *index,
>  	}
>  	stop_progress(&pd.progress);
>  
> +	if (pathspec) {
> +		/* earlier we made deep copies for each thread to work with */
> +		for (i = 0; i < threads; i++)
> +			clear_pathspec(&data[i].pathspec);
> +	}
> +
This round looks good to me.
Thanks, will queue.
>  	trace_performance_leave("preload index");
>  
>  	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);

← back to recent threads