mirror of
https://github.com/git-for-windows/git.git
synced 2025-12-11 11:16:01 -06:00
ff405069c4
When a Unix socket is initialized, the current directory's path is stored so that the cleanup code can `chdir()` back to where it was before exit. If the path that needs to be stored exceeds the default size of the `sun_path` attribute of `struct sockaddr_un` (which is defined as a 108-sized byte array on Linux), a larger buffer needs to be allocated so that it can hold the path, and it is the responsibility of the `unix_sockaddr_cleanup()` function to release that allocated memory. In Git's CI, this stack allocation is not necessary because the code is checked out to `/home/runner/work/git/git`. Concatenate the path `t/trash directory.t0301-credential-cache/.cache/git/credential/socket` and a terminating NUL, and you end up with 96 bytes, 12 shy of the default `sun_path` size. However, I use worktrees with slightly longer paths: `/home/me/projects/git/yes/i/nest/worktrees/to/organize/them/` is more in line with what I have. When I recently tried to locally reproduce a failure of the `linux-leaks` CI job, this t0301 test failed (where it had not failed in CI). The reason: When `credential-cache` tries to reach its daemon initially by calling `unix_sockaddr_init()`, it is expected that the daemon cannot be reached (the idea is to spin up the daemon in that case and try again). However, when this first call to `unix_sockaddr_init()` fails, the code returns early from the `unix_stream_connect()` function _without_ giving the cleanup code a chance to run, skipping the deallocation of above-mentioned path. The fix is easy: do not return early but instead go directly to the cleanup code. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
138 lines
2.8 KiB
C
138 lines
2.8 KiB
C
#include "git-compat-util.h"
|
|
#include "strbuf.h"
|
|
#include "unix-socket.h"
|
|
|
|
#define DEFAULT_UNIX_STREAM_LISTEN_BACKLOG (5)
|
|
|
|
static int chdir_len(const char *orig, int len)
|
|
{
|
|
char *path = xmemdupz(orig, len);
|
|
int r = chdir(path);
|
|
free(path);
|
|
return r;
|
|
}
|
|
|
|
struct unix_sockaddr_context {
|
|
char *orig_dir;
|
|
};
|
|
|
|
static void unix_sockaddr_cleanup(struct unix_sockaddr_context *ctx)
|
|
{
|
|
if (!ctx->orig_dir)
|
|
return;
|
|
/*
|
|
* If we fail, we can't just return an error, since we have
|
|
* moved the cwd of the whole process, which could confuse calling
|
|
* code. We are better off to just die.
|
|
*/
|
|
if (chdir(ctx->orig_dir) < 0)
|
|
die("unable to restore original working directory");
|
|
free(ctx->orig_dir);
|
|
}
|
|
|
|
static int unix_sockaddr_init(struct sockaddr_un *sa, const char *path,
|
|
struct unix_sockaddr_context *ctx,
|
|
int disallow_chdir)
|
|
{
|
|
int size = strlen(path) + 1;
|
|
|
|
ctx->orig_dir = NULL;
|
|
if (size > sizeof(sa->sun_path)) {
|
|
const char *slash;
|
|
const char *dir;
|
|
struct strbuf cwd = STRBUF_INIT;
|
|
|
|
if (disallow_chdir) {
|
|
errno = ENAMETOOLONG;
|
|
return -1;
|
|
}
|
|
|
|
slash = find_last_dir_sep(path);
|
|
if (!slash) {
|
|
errno = ENAMETOOLONG;
|
|
return -1;
|
|
}
|
|
|
|
dir = path;
|
|
path = slash + 1;
|
|
size = strlen(path) + 1;
|
|
if (size > sizeof(sa->sun_path)) {
|
|
errno = ENAMETOOLONG;
|
|
return -1;
|
|
}
|
|
if (strbuf_getcwd(&cwd))
|
|
return -1;
|
|
ctx->orig_dir = strbuf_detach(&cwd, NULL);
|
|
if (chdir_len(dir, slash - dir) < 0)
|
|
return -1;
|
|
}
|
|
|
|
memset(sa, 0, sizeof(*sa));
|
|
sa->sun_family = AF_UNIX;
|
|
memcpy(sa->sun_path, path, size);
|
|
return 0;
|
|
}
|
|
|
|
int unix_stream_connect(const char *path, int disallow_chdir)
|
|
{
|
|
int fd = -1, saved_errno;
|
|
struct sockaddr_un sa;
|
|
struct unix_sockaddr_context ctx;
|
|
|
|
if (unix_sockaddr_init(&sa, path, &ctx, disallow_chdir) < 0)
|
|
goto fail;
|
|
fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
if (fd < 0)
|
|
goto fail;
|
|
|
|
if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0)
|
|
goto fail;
|
|
unix_sockaddr_cleanup(&ctx);
|
|
return fd;
|
|
|
|
fail:
|
|
saved_errno = errno;
|
|
if (fd != -1)
|
|
close(fd);
|
|
unix_sockaddr_cleanup(&ctx);
|
|
errno = saved_errno;
|
|
return -1;
|
|
}
|
|
|
|
int unix_stream_listen(const char *path,
|
|
const struct unix_stream_listen_opts *opts)
|
|
{
|
|
int fd = -1, saved_errno;
|
|
int backlog;
|
|
struct sockaddr_un sa;
|
|
struct unix_sockaddr_context ctx;
|
|
|
|
unlink(path);
|
|
|
|
if (unix_sockaddr_init(&sa, path, &ctx, opts->disallow_chdir) < 0)
|
|
return -1;
|
|
fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
|
if (fd < 0)
|
|
goto fail;
|
|
|
|
if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0)
|
|
goto fail;
|
|
|
|
backlog = opts->listen_backlog_size;
|
|
if (backlog <= 0)
|
|
backlog = DEFAULT_UNIX_STREAM_LISTEN_BACKLOG;
|
|
if (listen(fd, backlog) < 0)
|
|
goto fail;
|
|
|
|
unix_sockaddr_cleanup(&ctx);
|
|
return fd;
|
|
|
|
fail:
|
|
saved_errno = errno;
|
|
if (fd != -1)
|
|
close(fd);
|
|
unix_sockaddr_cleanup(&ctx);
|
|
errno = saved_errno;
|
|
return -1;
|
|
}
|