security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

Use gnupg_fd_t for create_pipe_and_estream.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-07-03 15:23:58 +09:00
parent 7b2a114d45
commit c845adb5a1
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
7 changed files with 71 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/call-gpg.c
View File

@ -29,6 +29,7 @@
#include <time.h>
#include "call-gpg.h"
#include "sysutils.h"
#include "exechelp.h"
#include "i18n.h"
#include "logging.h"

79
common/exechelp-w32.c
View File

@ -223,37 +223,15 @@ 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 fds[2], int flags,
estream_t *r_fp, int outbound, int nonblock)
{
gpg_error_t err = 0;
HANDLE fds[2];
es_syshd_t syshd;
filedes[0] = filedes[1] = -1;
err = my_error (GPG_ERR_GENERAL);
if (!create_inheritable_pipe (fds, flags))
{
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;
}
}
fds[0] = fds[1] = GNUPG_INVALID_FD;
if (create_inheritable_pipe (fds, flags) < 0)
err = my_error_from_syserror ();
if (! err && r_fp)
{
@ -273,9 +251,9 @@ create_pipe_and_estream (int filedes[2], int flags,
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;
CloseHandle (fds[0]);
CloseHandle (fds[1]);
fds[0] = fds[1] = GNUPG_INVALID_FD;
return err;
}
}
@ -287,10 +265,9 @@ create_pipe_and_estream (int filedes[2], int flags,
inheritable. If R_FP is not NULL, an estream is created for the
read 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 fds[2], estream_t *r_fp, int nonblock)
{
return create_pipe_and_estream (filedes, INHERIT_WRITE,
r_fp, 0, nonblock);
return create_pipe_and_estream (fds, INHERIT_WRITE, r_fp, 0, nonblock);
}
@ -298,10 +275,9 @@ gnupg_create_inbound_pipe (int filedes[2], estream_t *r_fp, int nonblock)
inheritable. If R_FP is not NULL, 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 fds[2], estream_t *r_fp, int nonblock)
{
return create_pipe_and_estream (filedes, INHERIT_READ,
r_fp, 1, nonblock);
return create_pipe_and_estream (fds, INHERIT_READ, r_fp, 1, nonblock);
}
@ -310,8 +286,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;
}

4
common/exechelp.h
View File

@ -56,13 +56,13 @@ int *get_all_open_fds (void);
/* 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
write end and stored at R_FP. */
gpg_error_t gnupg_create_inbound_pipe (int filedes[2],
gpg_error_t gnupg_create_inbound_pipe (gnupg_fd_t filedes[2],
estream_t *r_fp, int 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. */
gpg_error_t gnupg_create_outbound_pipe (int filedes[2],
gpg_error_t gnupg_create_outbound_pipe (gnupg_fd_t filedes[2],
estream_t *r_fp, int nonblock);
/* Portable function to create a pipe. Under Windows both ends are

20
common/exectool.c
View File

@ -43,8 +43,8 @@
#include "logging.h"
#include "membuf.h"
#include "mischelp.h"
#include "exechelp.h"
#include "sysutils.h"
#include "exechelp.h"
#include "util.h"
#include "exectool.h"
@ -331,7 +331,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
#else
int exceptclose[2];
#endif
int extrapipe[2] = {-1, -1};
gnupg_fd_t extrapipe[2] = { GNUPG_INVALID_FD, GNUPG_INVALID_FD };
char extrafdbuf[20];
const char *argsave = NULL;
int argsaveidx;
@ -395,11 +395,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
goto leave;
}
/* Do not close in child. */
#ifdef HAVE_W32_SYSTEM
exceptclose[i] = (HANDLE)_get_osfhandle (extrapipe[0]);
#else
exceptclose[i] = extrapipe[0];
#endif
/* Now find the argument marker and replace by the pipe's fd.
Yeah, that is an ugly non-thread safe hack but it safes us to
create a copy of the array. */
@ -424,11 +420,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
i++;
}
#ifdef HAVE_W32_SYSTEM
exceptclose[i] = INVALID_HANDLE_VALUE;
#else
exceptclose[i] = -1;
#endif
exceptclose[i] = GNUPG_INVALID_FD;
err = gpgrt_spawn_actions_new (&act);
if (err)
@ -447,8 +439,12 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
| GPGRT_PROCESS_STDERR_PIPE), act, &proc);
gpgrt_process_get_streams (proc, GPGRT_PROCESS_STREAM_NONBLOCK,
input? &infp : NULL, &outfp, &errfp);
if (extrapipe[0] != -1)
if (extrapipe[0] != GNUPG_INVALID_FD)
#ifdef HAVE_W32_SYSTEM
CloseHandle (extrapipe[0]);
#else
close (extrapipe[0]);
#endif
if (argsave)
argv[argsaveidx] = argsave;
if (err)

2
common/t-exechelp.c
View File

@ -25,6 +25,7 @@
#include <unistd.h>
#include "util.h"
#include "sysutils.h"
#include "exechelp.h"
static int verbose;
@ -253,7 +254,6 @@ main (int argc, char **argv)
{
if (argc)
{
myname = argv[0];
argc--; argv++;
}
if (argc && !strcmp (argv[0], "--verbose"))

22
kbx/kbx-client-util.c
View File

@ -30,6 +30,7 @@
#include "../common/membuf.h"
#include "../common/i18n.h"
#include "../common/asshelp.h"
#include "../common/sysutils.h"
#include "../common/exechelp.h"
#include "../common/sysutils.h"
#include "../common/host2net.h"
@ -102,7 +103,7 @@ prepare_data_pipe (kbx_client_data_t kcd)
{
gpg_error_t err;
int rc;
int inpipe[2];
gnupg_fd_t inpipe[2];
estream_t infp;
npth_attr_t tattr;
@ -118,17 +119,22 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err; /* That should not happen. */
}
#ifdef HAVE_W32_SYSTEM
err = assuan_sendfd (kcd->ctx, (HANDLE)_get_osfhandle (inpipe[1]));
#else
err = assuan_sendfd (kcd->ctx, inpipe[1]);
#endif
if (err)
{
#ifdef HAVE_W32_SYSTEM
log_error ("sending fd %p to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err));
#else
log_error ("sending fd %d to keyboxd: %s <%s>\n",
inpipe[1], gpg_strerror (err), gpg_strsource (err));
#endif
es_fclose (infp);
gnupg_close_pipe (inpipe[1]);
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe[1]);
#else
close (inpipe[1]);
#endif
return err;
}
@ -142,7 +148,11 @@ prepare_data_pipe (kbx_client_data_t kcd)
return err;
}
#ifdef HAVE_W32_SYSTEM
CloseHandle (inpipe[1]);
#else
close (inpipe[1]);
#endif
kcd->fp = infp;
rc = npth_attr_init (&tattr);

2
tests/gpgscm/ffi.c
View File

@ -42,8 +42,8 @@
#endif
#include "../../common/util.h"
#include "../../common/exechelp.h"
#include "../../common/sysutils.h"
#include "../../common/exechelp.h"
#ifdef HAVE_W32_SYSTEM
#include <windows.h>