folkslinux
/
proot
mirror of https://github.com/proot-me/proot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix regression in socket name shortening (#278) 

Instead of creating a temporary socket directly,
create a temporary directory and have the socket be created in there.

Bug: https://github.com/proot-me/proot/issues/260
This commit is contained in:
Yichao Yu 2021-10-01 22:49:36 +08:00 committed by GitHub
parent 51b97964f3
commit 267efd6ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/syscall/socket.c
View File

@ -111,21 +111,10 @@ int translate_socketcall_enter(Tracee *tracee, word_t *address, int size)
/* Be careful: sun_path doesn't have to be null-terminated. */
if (strlen(host_path) > sizeof_path) {
char *shorter_host_path;
const char *shorter_host_dir;
const char *shorter_host_path;
Binding *binding;
/* The translated path is too long to fit the sun_path
* array, so let's bind it to a shorter path. */
shorter_host_path = create_temp_name(tracee->ctx, "proot");
if (shorter_host_path == NULL || strlen(shorter_host_path) > sizeof_path)
return -EINVAL;
if (mkstemp(shorter_host_path) == EEXIST)
return -EINVAL;
if (strlen(shorter_host_path) > sizeof_path)
return -EINVAL;
/* Ensure the guest path of this new binding is
* canonicalized, as it is always assumed. */
strcpy(user_path, host_path);
@ -133,6 +122,16 @@ int translate_socketcall_enter(Tracee *tracee, word_t *address, int size)
if (status < 0)
return -EINVAL;
/* The translated path is too long to fit the sun_path
* array, so let's bind it to a shorter path. */
shorter_host_dir = create_temp_directory(tracee->ctx, "proot");
if (shorter_host_dir == NULL)
return -EINVAL;
shorter_host_path = talloc_asprintf(tracee->ctx, "%s/s", shorter_host_dir);
if (strlen(shorter_host_path) > sizeof_path)
return -EINVAL;
/* Bing the guest path to a shorter host path. */
binding = insort_binding3(tracee, tracee->ctx, shorter_host_path, user_path);
if (binding == NULL)
@ -140,6 +139,7 @@ int translate_socketcall_enter(Tracee *tracee, word_t *address, int size)
/* This temporary file (shorter_host_path) will be removed once the
* binding is destroyed. */
talloc_reparent(tracee->ctx, binding, shorter_host_dir);
talloc_reparent(tracee->ctx, binding, shorter_host_path);
/* Let's use this shorter path now. */