From patchwork Mon Feb 6 19:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 13130513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F089EC636D3 for ; Mon, 6 Feb 2023 19:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229765AbjBFTIs (ORCPT ); Mon, 6 Feb 2023 14:08:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbjBFTIr (ORCPT ); Mon, 6 Feb 2023 14:08:47 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55C1D2B091 for ; Mon, 6 Feb 2023 11:08:45 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so1003277wmb.5 for ; Mon, 06 Feb 2023 11:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c5Wgd/gNzVP7IheqCyPKOEERfO9dhRheak+GTyyHRCI=; b=BzGFfE6oO8jHFK1kGbYsfY+jw/DLdcCy526ivzjCCMTwXLDnAWMIGNrroDO34AV+v+ YS471pkddbpESLI/bhXK5ZEtTsYLFtxBEIZnXmIWWLAFyu0/KblmetrUJdVD3nWZEsPx sSIrGG936Ox6/Y7qiNxnprV49E5tfU6jqMRkxvw74sclGCMAd52HTx9ubiHF3bC5KU2O 2FPw56BFzAnLOn67bLE5YbXSRsIwedjGmmgBS+rZNOJnilTYuPnseSVui/AbqHBz3exA CWcW01EIvmsylTaZZK/wzfiSQDQbb8F5vF5IzYt3nA2obiRgKogrUmKSXBhmPpqCv7Fd lREw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c5Wgd/gNzVP7IheqCyPKOEERfO9dhRheak+GTyyHRCI=; b=J5OdMrizTM041svH3ifIje7ZXQtmThRSboHy8nOF5i83b0IwiJPJrdSXij3WiPCSSh GOYxlZBPhVQEHtID78SKfAHE4qI6mlPJnEGrQpPh/qkHEnBhzRm9JlGlLpiqj2QL46Rt LT9p8gh7JEHOZQYv1I02IQ7I8NBZMqDZEZHBeB5FsEVkvpcDJVKhkHsw2W8TfWCJMT+s DD16p7pdVnUEuVNbpB81YUFP4WKgo04Xm/0sOg0f76O+jALAT0YaeNRwNpzzuZOwQ6uq THuOjQASDz0GFkSZvQ8u2Lgg57vdewtkT9VOuqcy3dRxC+4YsZCzrUNKJ7TUiwyZXjO2 NnmA== X-Gm-Message-State: AO0yUKXcoCAJtZW1R7UgviJYc6rr/xcnkNaoJ18FMoTVoQDOnXKs+KGo lN4jNtBPnXgnCpA+fwT11DPX3dpD/S9xSVnW X-Google-Smtp-Source: AK7set8eXzZd5YPAKWTASXzMs9KsE6eZEpRW+dyK9ebZUwXX2w0wH57f6jqO7W04x2jePZ/HNCoK1g== X-Received: by 2002:a05:600c:3ac4:b0:3dc:18de:b20d with SMTP id d4-20020a05600c3ac400b003dc18deb20dmr698217wms.33.1675710523433; Mon, 06 Feb 2023 11:08:43 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id p2-20020a05600c358200b003dc4ecfc4d7sm12538595wmq.29.2023.02.06.11.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:08:42 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Phillip Wood , Johannes Schindelin , Junio C Hamano , Taylor Blau , =?utf-8?q?Ren=C3=A9_Scharfe?= , =?utf-8?b?w4Z2YXIgQXJuZmo=?= =?utf-8?b?w7Zyw7AgQmphcm1hc29u?= Subject: [PATCH v4 0/8] sequencer API & users: fix widespread leaks Date: Mon, 6 Feb 2023 20:08:05 +0100 Message-Id: X-Mailer: git-send-email 2.39.1.1425.ge02fe682bd8 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This series fixes various widespread leaks in the sequencer and its users (rebase, revert, cherry-pick). As a result 18 tests become leak-free in their entirety. See the v1 for a longer general summary: https://lore.kernel.org/git/cover-00.10-00000000000-20221230T071741Z-avarab@gmail.com/ Changes since v3: * Rebased for newer "master", there were some conflicts due to adjacent changes. * Addressed Phillip's commit message comments (hopefully). Branch & CI for this at: https://github.com/avar/git/tree/avar/leak-fixes-sequencer-rebase-4 Ævar Arnfjörð Bjarmason (8): rebase: use "cleanup" pattern in do_interactive_rebase() sequencer.c: split up sequencer_remove_state() sequencer API users: fix get_replay_opts() leaks builtin/revert.c: move free-ing of "revs" to replay_opts_release() builtin/rebase.c: fix "options.onto_name" leak sequencer.c: always free() the "msgbuf" in do_pick_commit() builtin/rebase.c: free() "options.strategy_opts" commit.c: free() revs.commit in get_fork_point() builtin/rebase.c | 22 ++++++++------ builtin/revert.c | 8 ++--- commit.c | 1 + sequencer.c | 42 ++++++++++++++++---------- sequencer.h | 1 + t/t3405-rebase-malformed.sh | 1 + t/t3412-rebase-root.sh | 1 + t/t3416-rebase-onto-threedots.sh | 1 + t/t3419-rebase-patch-id.sh | 1 + t/t3423-rebase-reword.sh | 1 + t/t3425-rebase-topology-merges.sh | 2 ++ t/t3431-rebase-fork-point.sh | 1 + t/t3432-rebase-fast-forward.sh | 1 + t/t3437-rebase-fixup-options.sh | 1 + t/t3438-rebase-broken-files.sh | 2 ++ t/t3501-revert-cherry-pick.sh | 1 + t/t3502-cherry-pick-merge.sh | 1 + t/t3503-cherry-pick-root.sh | 1 + t/t3506-cherry-pick-ff.sh | 1 + t/t3511-cherry-pick-x.sh | 1 + t/t7402-submodule-rebase.sh | 1 + t/t9106-git-svn-commit-diff-clobber.sh | 1 - t/t9164-git-svn-dcommit-concurrent.sh | 1 - 23 files changed, 61 insertions(+), 33 deletions(-) Range-diff against v3: 1: b223429df33 ! 1: 029fc5f4b8c rebase: use "cleanup" pattern in do_interactive_rebase() @@ Commit message Signed-off-by: Ævar Arnfjörð Bjarmason ## builtin/rebase.c ## -@@ builtin/rebase.c: static void split_exec_commands(const char *cmd, struct string_list *commands) +@@ builtin/rebase.c: static int init_basic_state(struct replay_opts *opts, const char *head_name, static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) { @@ builtin/rebase.c: static int do_interactive_rebase(struct rebase_options *opts, } +cleanup: - string_list_clear(&commands, 0); free(revisions); free(shortrevisions); + todo_list_release(&todo_list); 2: 00c7f04363f = 2: b0c9da95ca1 sequencer.c: split up sequencer_remove_state() 3: e4a96898a68 ! 3: dbac0501424 rebase & sequencer API: fix get_replay_opts() leak in "rebase" @@ Metadata Author: Ævar Arnfjörð Bjarmason ## Commit message ## - rebase & sequencer API: fix get_replay_opts() leak in "rebase" + sequencer API users: fix get_replay_opts() leaks - Make the recently added replay_opts_release() function non-static and - use it for freeing the "struct replay_opts" constructed by the - get_replay_opts() function in "builtin/rebase.c". See [1] for the - initial addition of get_replay_opts(). + Make the replay_opts_release() function added in the preceding commit + non-static, and use it for freeing the "struct replay_opts" + constructed for "rebase" and "revert". To safely call our new replay_opts_release() we'll need to stop calling it in sequencer_remove_state(), and instead call it where we @@ Commit message previously called sequencer_remove_state() would be a hassle. Using a FREE_AND_NULL() pattern would also work, as it would be safe - replay_opts_release() repeatedly, but let's fix this properly instead, - by having the owner of the data free() it. - - See [2] for the initial implementation of "sequencer_remove_state()", - which assumed that it should be removing the full (including on-disk) - rebase state as a one-off. - - 1. 73fdc535d26 (rebase -i: use struct rebase_options to parse args, - 2019-04-17) - 2. 26ae337be11 (revert: Introduce --reset to remove sequencer state, - 2011-08-04) + to call replay_opts_release() repeatedly. But let's fix this properly + instead, by having the owner of the data free() it. Signed-off-by: Ævar Arnfjörð Bjarmason @@ builtin/rebase.c: static int do_interactive_rebase(struct rebase_options *opts, cleanup: + replay_opts_release(&replay); - string_list_clear(&commands, 0); free(revisions); free(shortrevisions); + todo_list_release(&todo_list); @@ builtin/rebase.c: static int run_sequencer_rebase(struct rebase_options *opts) struct replay_opts replay_opts = get_replay_opts(opts); 4: 9f72cc6e46b = 4: 6b29d7d00c2 builtin/revert.c: move free-ing of "revs" to replay_opts_release() 5: 3d5c3152f69 ! 5: f9c4d17fe70 builtin/rebase.c: fix "options.onto_name" leak @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix strbuf_release(&options.git_format_patch_opt); free(squash_onto_name); + free(keep_base_onto_name); - string_list_clear(&exec, 0); string_list_clear(&strategy_options, 0); return !!ret; + } ## t/t3416-rebase-onto-threedots.sh ## @@ t/t3416-rebase-onto-threedots.sh: test_description='git rebase --onto A...B' 6: c07dc006c6d = 6: 5c2870ed2e6 sequencer.c: always free() the "msgbuf" in do_pick_commit() 7: ee8262ab22a ! 7: 07ab875c3e2 builtin/rebase.c: free() "options.strategy_opts" @@ Commit message ## builtin/rebase.c ## @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix) free(options.gpg_sign_opt); - free(options.cmd); + string_list_clear(&options.exec, 0); free(options.strategy); + free(options.strategy_opts); strbuf_release(&options.git_format_patch_opt); 8: 84343ea6bf6 = 8: 6ab2edcc135 commit.c: free() revs.commit in get_fork_point()