From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, jnareb@gmail.com, mlbright@gmail.com,
e@80x24.org, peff@peff.net, Johannes.Schindelin@gmx.de,
ben@wijen.net, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v5 15/15] read-cache: make sure file handles are not inherited by child processes
Date: Wed, 10 Aug 2016 15:04:11 +0200 [thread overview]
Message-ID: <20160810130411.12419-16-larsxschneider@gmail.com> (raw)
In-Reply-To: <20160810130411.12419-1-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
Consider the case of a file that requires filtering and is present in branch A
but not in branch B. If A is the current HEAD and we checkout B then the
following happens:
1. ce_compare_data() opens the file
2. index_fd() detects that the file requires to run a clean filter and
calls index_stream_convert_blob()
4. index_stream_convert_blob() calls convert_to_git_filter_fd()
5. convert_to_git_filter_fd() calls apply_filter() which creates a new
long running filter process (in case it is the first file of this kind
to be filtered)
6. The new filter process inherits all file handles. This is the default
on Linux/OSX and is explicitly defined in the `CreateProcessW` call
in `mingw.c` on Windows.
7. ce_compare_data() closes the file
8. Git unlinks the file as it is not present in B
The unlink operation does not work on Windows because the filter process has
still an open handle to the file. Apparently that is no problem on Linux/OSX.
Probably because "[...] the two file descriptors share open file status flags"
(see fork(2)).
Fix this problem by opening files in read-cache with the `O_CLOEXEC` flag to
ensure that the file descriptor does not remain open in a newly spawned process.
`O_CLOEXEX` is defined as `O_NOINHERIT` on Windows. A similar fix for temporary
file handles was applied on Git for Windows already:
https://github.com/git-for-windows/git/commit/667b8b51ec850c3e1c7d75dee69dc13c29d1f162
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
read-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index db27766..f481dee 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -159,7 +159,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
{
int match = -1;
- int fd = open(ce->name, O_RDONLY);
+ int fd = open(ce->name, O_RDONLY | O_CLOEXEC);
if (fd >= 0) {
unsigned char sha1[20];
--
2.9.2
next prev parent reply other threads:[~2016-08-10 19:00 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160803164225.46355-1-larsxschneider@gmail.com/>
2016-08-10 13:03 ` [PATCH v5 00/15] Git filter protocol larsxschneider
2016-08-10 13:03 ` [PATCH v5 01/15] pkt-line: extract set_packet_header() larsxschneider
2016-08-10 13:03 ` [PATCH v5 02/15] pkt-line: call packet_trace() only if a packet is actually send larsxschneider
2016-08-10 13:13 ` Jeff King
2016-08-10 13:24 ` Lars Schneider
2016-08-10 13:30 ` Jeff King
2016-08-10 13:51 ` Lars Schneider
2016-08-10 14:33 ` Jeff King
2016-08-10 13:03 ` [PATCH v5 03/15] pkt-line: add `gentle` parameter to format_packet() larsxschneider
2016-08-10 13:15 ` Jeff King
2016-08-10 13:29 ` Lars Schneider
2016-08-10 13:37 ` Jeff King
2016-08-10 13:59 ` Lars Schneider
2016-08-10 14:34 ` Jeff King
2016-08-10 13:04 ` [PATCH v5 04/15] pkt-line: add packet_write_gently() larsxschneider
2016-08-10 13:28 ` Jeff King
2016-08-10 13:36 ` Lars Schneider
2016-08-10 13:40 ` Jeff King
2016-08-10 17:17 ` Junio C Hamano
2016-08-10 17:49 ` Lars Schneider
2016-08-10 18:21 ` Junio C Hamano
2016-08-10 19:15 ` Lars Schneider
2016-08-10 13:04 ` [PATCH v5 05/15] pkt-line: add packet_write_gently_fmt() larsxschneider
2016-08-10 13:43 ` Jeff King
2016-08-10 14:10 ` Lars Schneider
2016-08-10 15:01 ` Jeff King
2016-08-10 17:18 ` Junio C Hamano
2016-08-10 17:53 ` Lars Schneider
2016-08-10 18:42 ` Junio C Hamano
2016-08-10 13:04 ` [PATCH v5 06/15] pkt-line: add packet_flush_gently() larsxschneider
2016-08-10 13:04 ` [PATCH v5 07/15] pkt-line: add functions to read/write flush terminated packet streams larsxschneider
2016-08-10 13:04 ` [PATCH v5 08/15] pkt-line: rename packet_write() to packet_write_fmt() larsxschneider
2016-08-10 13:04 ` [PATCH v5 09/15] pack-protocol: fix maximum pkt-line size larsxschneider
2016-08-10 13:04 ` [PATCH v5 10/15] convert: quote filter names in error messages larsxschneider
2016-08-10 13:04 ` [PATCH v5 11/15] convert: modernize tests larsxschneider
2016-08-10 13:04 ` [PATCH v5 12/15] convert: generate large test files only once larsxschneider
2016-08-10 13:04 ` [PATCH v5 13/15] convert: make apply_filter() adhere to standard Git error handling larsxschneider
2016-08-10 13:04 ` [PATCH v5 14/15] convert: add filter.<driver>.process option larsxschneider
2016-08-12 16:33 ` Stefan Beller
2016-08-12 16:38 ` Jeff King
2016-08-12 16:48 ` Stefan Beller
2016-08-12 17:08 ` Lars Schneider
2016-08-12 17:13 ` Junio C Hamano
2016-08-12 17:21 ` Lars Schneider
2016-08-12 18:03 ` Junio C Hamano
2016-08-12 16:59 ` Lars Schneider
2016-08-12 17:07 ` Stefan Beller
2016-08-12 17:14 ` Lars Schneider
2016-08-10 13:04 ` larsxschneider [this message]
2016-08-18 14:23 ` [PATCH v5 15/15] read-cache: make sure file handles are not inherited by child processes Johannes Schindelin
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=20160810130411.12419-16-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ben@wijen.net \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=mlbright@gmail.com \
--cc=peff@peff.net \
/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).