kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/verify-tag.c: ignore SIGPIPE in gpg-interface 

The verify_signed_buffer() function may trigger a SIGPIPE when the
GPG child process terminates early (due to a bad keyid, for example)
and Git tries to write to it afterwards.  Previously, ignoring
SIGPIPE was done in builtin/verify-tag.c to avoid this issue.

However, any other caller who wants to call verify_signed_buffer()
would have to do the same.

Use sigchain_push(SIGPIPE, SIG_IGN) in verify_signed_buffer(),
pretty much like in sign_buffer(), so that any caller is not
required to perform this task.

This will avoid possible mistakes by further developers using
verify_signed_buffer().

Signed-off-by: Santiago Torres <santiago@nyu.edu>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Santiago Torres 2016-04-05 12:07:24 -04:00 committed by Junio C Hamano
parent 90f7b16b3a
commit d281b45d75
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/verify-tag.c
View File

@ -95,9 +95,6 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
if (verbose) if (verbose)
flags |= GPG_VERIFY_VERBOSE; flags |= GPG_VERIFY_VERBOSE;


/* sometimes the program was terminated because this signal
* was received in the process of writing the gpg input: */
signal(SIGPIPE, SIG_IGN);
while (i < argc) while (i < argc)
if (verify_tag(argv[i++], flags)) if (verify_tag(argv[i++], flags))
had_error = 1; had_error = 1;

2
gpg-interface.c
View File

@ -237,6 +237,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
return error(_("could not run gpg.")); return error(_("could not run gpg."));
} }


sigchain_push(SIGPIPE, SIG_IGN);
write_in_full(gpg.in, payload, payload_size); write_in_full(gpg.in, payload, payload_size);
close(gpg.in); close(gpg.in);


@ -250,6 +251,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
close(gpg.out); close(gpg.out);


ret = finish_command(&gpg); ret = finish_command(&gpg);
sigchain_pop(SIGPIPE);


unlink_or_warn(path); unlink_or_warn(path);