luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix,pipe: fix handling null buffer in uv_pipe_get{sock,peer}name

Browse Source 
Fixes: https://github.com/libuv/libuv/issues/4610
This commit is contained in:
Saúl Ibarra Corretgé 2024-11-19 15:02:57 +01:00
parent d05744e3ed
commit 31ea3411cc
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/unix/pipe.c
View File

@ -360,6 +360,9 @@ static int uv__pipe_getsockpeername(const uv_pipe_t* handle,
char* p; char* p;
int err; int err;
if (buffer == NULL || size == NULL || *size == 0)
return UV_EINVAL;
addrlen = sizeof(sa); addrlen = sizeof(sa);
memset(&sa, 0, addrlen); memset(&sa, 0, addrlen);
err = uv__getsockpeername((const uv_handle_t*) handle, err = uv__getsockpeername((const uv_handle_t*) handle,
@ -444,7 +447,7 @@ uv_handle_type uv_pipe_pending_type(uv_pipe_t* handle) {
int uv_pipe_chmod(uv_pipe_t* handle, int mode) { int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
unsigned desired_mode; unsigned desired_mode;
struct stat pipe_stat; struct stat pipe_stat;
char* name_buffer; char name_buffer[1 + UV__PATH_MAX];
size_t name_len; size_t name_len;
int r; int r;
@ -457,26 +460,14 @@ int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
return UV_EINVAL; return UV_EINVAL;
/* Unfortunately fchmod does not work on all platforms, we will use chmod. */ /* Unfortunately fchmod does not work on all platforms, we will use chmod. */
name_len = 0; name_len = sizeof(name_buffer);
r = uv_pipe_getsockname(handle, NULL, &name_len);
if (r != UV_ENOBUFS)
return r;
name_buffer = uv__malloc(name_len);
if (name_buffer == NULL)
return UV_ENOMEM;
r = uv_pipe_getsockname(handle, name_buffer, &name_len); r = uv_pipe_getsockname(handle, name_buffer, &name_len);
if (r != 0) { if (r != 0)
uv__free(name_buffer);
return r; return r;
}
/* stat must be used as fstat has a bug on Darwin */ /* stat must be used as fstat has a bug on Darwin */
if (uv__stat(name_buffer, &pipe_stat) == -1) { if (uv__stat(name_buffer, &pipe_stat) == -1)
uv__free(name_buffer); return UV__ERR(errno);
return -errno;
}
desired_mode = 0; desired_mode = 0;
if (mode & UV_READABLE) if (mode & UV_READABLE)
@ -485,15 +476,12 @@ int uv_pipe_chmod(uv_pipe_t* handle, int mode) {
desired_mode |= S_IWUSR | S_IWGRP | S_IWOTH; desired_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
/* Exit early if pipe already has desired mode. */ /* Exit early if pipe already has desired mode. */
if ((pipe_stat.st_mode & desired_mode) == desired_mode) { if ((pipe_stat.st_mode & desired_mode) == desired_mode)
uv__free(name_buffer);
return 0; return 0;
}
pipe_stat.st_mode |= desired_mode; pipe_stat.st_mode |= desired_mode;
r = chmod(name_buffer, pipe_stat.st_mode); r = chmod(name_buffer, pipe_stat.st_mode);
uv__free(name_buffer);
return r != -1 ? 0 : UV__ERR(errno); return r != -1 ? 0 : UV__ERR(errno);
} }

9
test/test-pipe-getsockname.c
View File

@ -154,6 +154,15 @@ TEST_IMPL(pipe_getsockname) {
ASSERT_STR_EQ(pipe_server.pipe_fname, TEST_PIPENAME); ASSERT_STR_EQ(pipe_server.pipe_fname, TEST_PIPENAME);
#endif #endif
r = uv_pipe_getsockname(&pipe_server, NULL, &len);
ASSERT_EQ(r, UV_EINVAL);
r = uv_pipe_getsockname(&pipe_server, buf, NULL);
ASSERT_EQ(r, UV_EINVAL);
r = uv_pipe_getsockname(&pipe_server, NULL, NULL);
ASSERT_EQ(r, UV_EINVAL);
len = sizeof(TEST_PIPENAME) - 1; len = sizeof(TEST_PIPENAME) - 1;
ASSERT_EQ(UV_ENOBUFS, uv_pipe_getsockname(&pipe_server, buf, &len)); ASSERT_EQ(UV_ENOBUFS, uv_pipe_getsockname(&pipe_server, buf, &len));