From af6c47b2910f394faf582800d60d88e9b4dcf834 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 9 Jul 2024 10:29:44 +0900 Subject: common,kbx,tests: Clean up the PIPE function API. * common/call-gpg.c (_gpg_encrypt, _gpg_decrypt): Simply, use gnupg_create_pipe. * tests/gpgscm/ffi.c (do_inbound_pipe): Likewise. * common/exechelp.h (gnupg_create_inbound_pipe): Use gnupg_fd_t for native pipe descriptor and don't expose other end of pipe. (gnupg_create_outbound_pipe): Ditto. * common/exechelp-posix.c (create_pipe_and_estream): Clean up. (gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL. (gnupg_create_outbound_pipe: Ditto. * common/exechelp-w32.c (create_pipe_and_estream): Clean up. (gnupg_create_inbound_pipe): Fail if R_FD or R_FP is NULL. (gnupg_create_outbound_pipe: Ditto. (gnupg_create_pipe): Move the code from original create_pipe_and_estream to call _open_osfhandle. * common/exectool.c (gnupg_exec_tool_stream): Follow the change of API. * kbx/kbx-client-util.c (prepare_data_pipe): Likewise. -- GnuPG-bug-id: 7194 Signed-off-by: NIIBE Yutaka --- common/exechelp-w32.c | 134 ++++++++++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 59 deletions(-) (limited to 'common/exechelp-w32.c') diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c index 51d6920bd..0c8314296 100644 --- a/common/exechelp-w32.c +++ b/common/exechelp-w32.c @@ -223,85 +223,72 @@ create_inheritable_pipe (HANDLE filedes[2], int flags) static gpg_error_t -create_pipe_and_estream (int filedes[2], int flags, +create_pipe_and_estream (gnupg_fd_t *r_fd, int flags, estream_t *r_fp, int outbound, int nonblock) { gpg_error_t err = 0; - HANDLE fds[2]; es_syshd_t syshd; + gnupg_fd_t fds[2]; - filedes[0] = filedes[1] = -1; - err = my_error (GPG_ERR_GENERAL); - if (!create_inheritable_pipe (fds, flags)) + if (create_inheritable_pipe (fds, flags) < 0) { - filedes[0] = _open_osfhandle (handle_to_fd (fds[0]), O_RDONLY); - if (filedes[0] == -1) - { - log_error ("failed to translate osfhandle %p\n", fds[0]); - CloseHandle (fds[1]); - } - else - { - filedes[1] = _open_osfhandle (handle_to_fd (fds[1]), O_APPEND); - if (filedes[1] == -1) - { - log_error ("failed to translate osfhandle %p\n", fds[1]); - close (filedes[0]); - filedes[0] = -1; - CloseHandle (fds[1]); - } - else - err = 0; - } + err = my_error_from_syserror (); + log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); + *r_fd = GNUPG_INVALID_FD; + *r_fp = NULL; + return err; } - if (! err && r_fp) + syshd.type = ES_SYSHD_HANDLE; + if (!outbound) { - syshd.type = ES_SYSHD_HANDLE; - if (!outbound) - { - syshd.u.handle = fds[0]; - *r_fp = es_sysopen (&syshd, nonblock? "r,nonblock" : "r"); - } - else - { - syshd.u.handle = fds[1]; - *r_fp = es_sysopen (&syshd, nonblock? "w,nonblock" : "w"); - } - if (!*r_fp) - { - err = my_error_from_syserror (); - log_error (_("error creating a stream for a pipe: %s\n"), - gpg_strerror (err)); - close (filedes[0]); - close (filedes[1]); - filedes[0] = filedes[1] = -1; - return err; - } + syshd.u.handle = fds[0]; + *r_fd = fds[1]; + *r_fp = es_sysopen (&syshd, nonblock? "r,nonblock" : "r"); + } + else + { + syshd.u.handle = fds[1]; + *r_fd = fds[0]; + *r_fp = es_sysopen (&syshd, nonblock? "w,nonblock" : "w"); + } + if (!*r_fp) + { + err = my_error_from_syserror (); + log_error (_("error creating a stream for a pipe: %s\n"), + gpg_strerror (err)); + CloseHandle (fds[0]); + CloseHandle (fds[1]); + *r_fd = GNUPG_INVALID_FD; + return err; } - return err; + return 0; } /* Portable function to create a pipe. Under Windows the write end is - inheritable. If R_FP is not NULL, an estream is created for the - read end and stored at R_FP. */ + inheritable. Pipe is created and the read end is stored at R_FD. + An estream is created for the write end and stored at R_FP. */ gpg_error_t -gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock) +gnupg_create_inbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock) { - return create_pipe_and_estream (filedes, INHERIT_WRITE, - r_fp, 0, nonblock); + if (!r_fd || !r_fp) + gpg_error (GPG_ERR_INV_ARG); + + return create_pipe_and_estream (r_fd, INHERIT_WRITE, r_fp, 0, nonblock); } /* Portable function to create a pipe. Under Windows the read end is - inheritable. If R_FP is not NULL, an estream is created for the - write end and stored at R_FP. */ + inheritable. Pipe is created and the write end is stored at R_FD. + An estream is created for the write end and stored at R_FP. */ gpg_error_t -gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock) +gnupg_create_outbound_pipe (gnupg_fd_t *r_fd, estream_t *r_fp, int nonblock) { - return create_pipe_and_estream (filedes, INHERIT_READ, - r_fp, 1, nonblock); + if (!r_fd || !r_fp) + gpg_error (GPG_ERR_INV_ARG); + + return create_pipe_and_estream (r_fd, INHERIT_READ, r_fp, 1, nonblock); } @@ -310,8 +297,37 @@ gnupg_create_outbound_pipe (int filedes[2], estream_t *r_fp, int nonblock) gpg_error_t gnupg_create_pipe (int filedes[2]) { - return create_pipe_and_estream (filedes, INHERIT_BOTH, - NULL, 0, 0); + gnupg_fd_t fds[2]; + gpg_error_t err = 0; + + if (create_inheritable_pipe (fds, INHERIT_BOTH) < 0) + return my_error_from_syserror (); + + filedes[0] = _open_osfhandle (handle_to_fd (fds[0]), O_RDONLY); + if (filedes[0] == -1) + { + log_error ("failed to translate osfhandle %p\n", fds[0]); + CloseHandle (fds[0]); + CloseHandle (fds[1]); + filedes[1] = -1; + err = my_error (GPG_ERR_GENERAL); + } + else + { + filedes[1] = _open_osfhandle (handle_to_fd (fds[1]), O_APPEND); + if (filedes[1] == -1) + { + log_error ("failed to translate osfhandle %p\n", fds[1]); + close (filedes[0]); + filedes[0] = -1; + CloseHandle (fds[1]); + err = my_error (GPG_ERR_GENERAL); + } + else + err = 0; + } + + return err; } -- cgit v1.2.3