]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/receive-pack.c
receive-pack: fix deadlock when we cannot create tmpdir
authorJeff King <peff@peff.net>
Tue, 7 Mar 2017 13:35:34 +0000 (08:35 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Mar 2017 22:51:03 +0000 (14:51 -0800)
commit6cdad1f133475f2bff0dfe2fbe90c351df3ea61d
treeb0cf8770627b5157e38ca69b7e275ad204ab3ad6
parent454cb6bd52a4de614a3633e4f547af03d5c3b640
receive-pack: fix deadlock when we cannot create tmpdir

The err_fd descriptor passed to the unpack() function is
intended to be handed off to the child index-pack, and our
async muxer will read until it gets EOF. However, if we
encounter an error before handing off the descriptor, we
must manually close(err_fd). Otherwise we will be waiting
for our muxer to finish, while the muxer is waiting for EOF
on err_fd.

We fixed an identical deadlock already in 49ecfa13f
(receive-pack: close sideband fd on early pack errors,
2013-04-19). But since then, the function grew a new
early-return in 722ff7f87 (receive-pack: quarantine objects
until pre-receive accepts, 2016-10-03), when we fail to
create a temporary directory. This return needs the same
treatment.

Reported-by: Horst Schirmeier <horst@schirmeier.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/receive-pack.c