From patchwork Mon May 13 07:15:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13663060 Received: from wfhigh4-smtp.messagingengine.com (wfhigh4-smtp.messagingengine.com [64.147.123.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D977146A6D for ; Mon, 13 May 2024 07:15:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715584515; cv=none; b=i/lynzUg66I0V0yssiTx/2HO22CoK/hZJbSY6S1nKUJvSgVswn4pWg2asMqlol5VOitSfyoNtk0LQObNUwulNMJNFOyTHael24uZ3/2+7dQQb9NeCmQ8HPgiepk2AfMk6DRU4ALN/85hsiJxylIZ+9jAdTGUucvtx3ZFLXCqLLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715584515; c=relaxed/simple; bh=sspqcdNnO/q9j8VdLery3iG+dNU/IVdP1JfQZHR601U=; h=Date:From:To:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=fFIBndOkEWaxL6hiassFHIdiylvvLG1+qPLSEAnhWw+cjf4jF4IVlbUyUk9E2z1qyXlf4zEUtiqL/ib4iy4JQ5U4yn1/xfxXGaRP9ABttXPBwSsM5G0k3S95k5NHpy2AxUkxZ1znVLV5ClXIcbN/YgaERnZu6P47CzDPEV/Smgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=MSe3hNQD; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=RovyOj7/; arc=none smtp.client-ip=64.147.123.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="MSe3hNQD"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="RovyOj7/" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.west.internal (Postfix) with ESMTP id 683A91800103 for ; Mon, 13 May 2024 03:15:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 13 May 2024 03:15:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715584512; x=1715670912; bh=ZfBMD2FaJo rOMUYHQIByqqDdg8VSFLnTvRspMuv0sdI=; b=MSe3hNQDzbRUXmkkr0cff+T3Je k5HaOd3XyqrkM6HXXXGP65KIlDH4zeaqVeqHr9lG6ebNkxvQtiATE6bdUgbIU5yu kBXos8kvBA4CrRPOB3AaRBW9nQOGA04fpcYHSn038Z/2ONNQ7cYnCDMu+87+UpYu kcxBsxwCe0KKa4INJ1R8qtGL7HFgj4N2VLurAKnBCs7X79fgsqV/eW/9QKW3Dc1O TVZZZaekxtsaag3hjEkKAxFMNPDgTVlnW6FFXRnWfB3eBwmRroi3K2TbK7ndBrBx PmJKnzXeSCdi3DRJQuCIIpGSr8k/aehM38DlxW5kHbXYTIf+QaJ97KokH+yg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1715584512; x=1715670912; bh=ZfBMD2FaJorOMUYHQIByqqDdg8VS FLnTvRspMuv0sdI=; b=RovyOj7/CQoOkQPOlH6e05qdlP8MglX6jgaDmBcVD0Yj 7QklbuJqNPGF/G5U0ocJvvqdpDpZVJOrT0mXN52EDg67ZRYuB0g+HSYZJBdiJrGC wHTYA/2ZIREHvcHc7GKwOuaAHGuLQy14dJcXvl2BzJb9oPYAK2HvMj8g1GOiB8OF 3XFSmo9w2LtlT490CY0tglHY9Ytwtn5yfr33t0hHhFv9vjpbtYLTzRkq+RcG2jx4 PH0CatUG8XHiMO+3AT+doDYnsKqGJs9Bx8yrEUexgtQODdywqXZ4rMohb7YvA2Hk DOO27dpfZJL75ZHcEBIFZ/smJV2Ac4AKUyG4hiAf9A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdegfedguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehgtd erredttdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshes phhkshdrihhmqeenucggtffrrghtthgvrhhnpeehgfejueevjeetudehgffffeffvdejfe ejiedvkeffgfekuefgheevteeufeelkeenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 13 May 2024 03:15:11 -0400 (EDT) Received: by localhost (OpenSMTPD) with ESMTPSA id 25908023 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 13 May 2024 07:14:53 +0000 (UTC) Date: Mon, 13 May 2024 09:15:09 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Subject: [PATCH 1/2] builtin/patch-id: fix uninitialized hash function Message-ID: <3200dcad2372fef3bcb4da599b44043bcf5b3692.1715582857.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: In c8aed5e8da (repository: stop setting SHA1 as the default object hash, 2024-05-07), we have adapted `initialize_repository()` to no longer set up a default hash function. As this function is also used to set up `the_repository`, the consequence is that `the_hash_algo` will now by default be a `NULL` pointer unless the hash algorithm was configured properly. This is done as a mechanism to detect cases where we may be using the wrong hash function by accident. This change now causes git-patch-id(1) to segfault when it's run outside of a repository. As this command can read diffs from stdin, it does not necessarily need a repository, but then relies on `the_hash_algo` to compute the patch ID itself. It is somewhat dubious that git-patch-id(1) relies on `the_hash_algo` in the first place. Quoting its manpage: A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with line numbers ignored. As such, it’s "reasonably stable", but at the same time also reasonably unique, i.e., two patches that have the same "patch ID" are almost guaranteed to be the same thing. We explicitly document patch IDs to be using SHA-1. Furthermore, patch IDs are supposed to be stable for most of the part. But even with the same input, the patch IDs will now be different depending on the repo's configured object hash. Work around the issue by setting up SHA-1 when there was no startup repository for now. This is arguably not the correct fix, but for now we rather want to focus on getting the segfault fixed. Signed-off-by: Patrick Steinhardt --- builtin/patch-id.c | 13 +++++++++++++ t/t4204-patch-id.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/builtin/patch-id.c b/builtin/patch-id.c index 3894d2b970..be5a85e71c 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -5,6 +5,7 @@ #include "hash.h" #include "hex.h" #include "parse-options.h" +#include "setup.h" static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) { @@ -237,6 +238,18 @@ int cmd_patch_id(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, builtin_patch_id_options, patch_id_usage, 0); + /* + * We rely on `the_hash_algo` to compute patch IDs. This is dubious as + * it means that the hash algorithm now depends on the object hash of + * the repository, even though git-patch-id(1) clearly defines that + * patch IDs always use SHA1. + * + * TODO: This hack should be removed in favor of converting the code + * that computes patch IDs to always use SHA1. + */ + if (!startup_info->have_repository) + repo_set_hash_algo(the_repository, GIT_HASH_SHA1); + generate_id_list(opts ? opts > 1 : config.stable, opts ? opts == 3 : config.verbatim); return 0; diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index a7fa94ce0a..605faea0c7 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -310,4 +310,38 @@ test_expect_success 'patch-id handles diffs with one line of before/after' ' test_config patchid.stable true && calc_patch_id diffu1stable diff <<-\EOF && + diff --git a/bar b/bar + index bdaf90f..31051f6 100644 + --- a/bar + +++ b/bar + @@ -2 +2,2 @@ + b + +c + EOF + + git init --object-format=sha1 repo-sha1 && + git -C repo-sha1 patch-id patch-id-sha1 && + git init --object-format=sha256 repo-sha256 && + git -C repo-sha256 patch-id patch-id-sha256 && + test_cmp patch-id-sha1 patch-id-sha256 +' + +test_expect_success 'patch-id without repository' ' + cat >diff <<-\EOF && + diff --git a/bar b/bar + index bdaf90f..31051f6 100644 + --- a/bar + +++ b/bar + @@ -2 +2,2 @@ + b + +c + EOF + nongit git patch-id X-Patchwork-Id: 13663061 Received: from wfhigh4-smtp.messagingengine.com (wfhigh4-smtp.messagingengine.com [64.147.123.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9988146A6D for ; Mon, 13 May 2024 07:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.155 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715584519; cv=none; b=m/qmPdnN5pD+s9N+qp4yu937gytDKlDuYQSB68MKypCNFtYBKMouL01fXbBdraXtC9ymvzaWfUlmi77A5do35tKqr0r6XmJzjmaC2wEELrvr1qwDgg+n76O331KcxLtE4ocdWcVSKw5aY01yzfrhidCstLzNa1KF2Ailw67gMWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715584519; c=relaxed/simple; bh=cwR8RZ+MjJ/jR1GSUtvG7ceK+Op+3hw7TRxreQjcVqI=; h=Date:From:To:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=VutgoNVbwqI+T7miBV67/3/b00T2bk5fwB3hcPBUFGJ9SAtT0/cFL60w5P6qb3jkTy7SLeT/WxUiuYorEdu+IcAyrvS0+iukcXi4poh46g8nTT9KUfLxALdqQ4VIr6QoJPvI1bPFkJw0HwUTKwvu0uFxzTuxHoHh2xHrO4VFMSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=WHx3ZvJ9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Js8xhx9v; arc=none smtp.client-ip=64.147.123.155 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="WHx3ZvJ9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Js8xhx9v" Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id EB0EE18000EA for ; Mon, 13 May 2024 03:15:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 13 May 2024 03:15:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715584516; x=1715670916; bh=cAw33wxL0r E1Of8yKWOb3wo7VdAzwQZSUWUj8Y78Wf0=; b=WHx3ZvJ9MszoHYPAWt/4+aEXWg ia4qsXWHzoZapjckNgnyvfq1W3gK2Utyg2BZMptqkGOhNM18i51C2ptTn+xFfE0B M3f4CsIM81B+ze7bbQeOncFIo+nlVVluWOqz8aHXKumXvWsJTDjH1q70VGosTNXU n5CbM7bvi6xe0dA+UJmWA+yYza9m0c9kXA64MHg0RqeglPm252cKhU3A7RFPB0lU p3aboY5EJYELuSDXSvC03NQu0rTLo0dp5ZqbLjZGoQTzuAbNdP/j700NrsEkx8cL 825BxqA+t2pFVZJn+v+RJ/aOlK4+1VLMqYDzukN05kWMXyCwjY8qqU/1esXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1715584516; x=1715670916; bh=cAw33wxL0rE1Of8yKWOb3wo7VdAz wQZSUWUj8Y78Wf0=; b=Js8xhx9vsosF9INOwOPqjXNOf79IAfAkhw9/jtJekZrH DTfw8Sn8MnG3jWj6l9qQHb78PLXNs0Sv+bQBiKQAEZnOrj2ZzRP3Wr/Gu1Wscz4K v8EYgMx/PvviVPyg66btuA+S5MclE6aT8292+OFcqXSrbxcODph2gCACfwNzp0Nw cVnctwqcUWM95pSLGpqO4Qp/+5Pv0Fo7FGSIGilCOpjI884FLOSKANj+wYAzLBhh XsVcC1xsPFMuZEEkMq9uLGm1yKsWCuVwPp8kRjVywLE96m3IDaP1/hQ6qFfYTqLu +AEYmvW4ptLXRUaQz1G2qGYsFm+7A0qIWq8/IJKkiw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdegfedguddugecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehgtd erredttddvnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshes phhkshdrihhmqeenucggtffrrghtthgvrhhnpeehgefhtdefueffheekgfffudelffejtd fhvdejkedthfehvdelgfetgfdvtedthfenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 13 May 2024 03:15:15 -0400 (EDT) Received: by localhost (OpenSMTPD) with ESMTPSA id 2e98752b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 13 May 2024 07:14:57 +0000 (UTC) Date: Mon, 13 May 2024 09:15:13 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Subject: [PATCH 2/2] builtin/hash-object: fix uninitialized hash function Message-ID: <1e010f798ce50e51100bd46564a69ddbd31d29ea.1715582857.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The git-hash-object(1) command allows users to hash an object even without a repository. Starting with c8aed5e8da (repository: stop setting SHA1 as the default object hash, 2024-05-07), this will make us hit an uninitialized hash function, which subsequently leads to a segfault. Fix this by falling back to SHA-1 explicitly when running outside of a Git repository. Eventually, we should expose this function as a command line option to the users so that they can pick which object hash to use by themselves. Signed-off-by: Patrick Steinhardt --- builtin/hash-object.c | 7 +++++++ t/t1007-hash-object.sh | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 82ca6d2bfd..0855f4f8aa 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -123,6 +123,13 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix) else prefix = setup_git_directory_gently(&nongit); + /* + * TODO: Allow the hash algorithm to be configured by the user via a + * command line option when not using `-w`. + */ + if (nongit) + repo_set_hash_algo(the_repository, GIT_HASH_SHA1); + if (vpath && prefix) { vpath_free = prefix_filename(prefix, vpath); vpath = vpath_free; diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh index 64aea38486..4c138c6ca4 100755 --- a/t/t1007-hash-object.sh +++ b/t/t1007-hash-object.sh @@ -260,4 +260,10 @@ test_expect_success '--literally with extra-long type' ' echo example | git hash-object -t $t --literally --stdin ' +test_expect_success '--stdin outside of repository' ' + nongit git hash-object --stdin actual && + echo "$(test_oid hello)" >expect && + test_cmp expect actual +' + test_done