gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix openat

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-12-27 14:59:13 +09:00
parent 6084faeecd
commit cd54c5983a
3 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
executer/user/mcexec.c
View File

@@ -3213,17 +3213,10 @@ int main_loop(struct thread_data_s *my_thread)
memset(pathbuf, '\0', sizeof(pathbuf)); memset(pathbuf, '\0', sizeof(pathbuf));
/* check argument 1 dirfd */ /* check argument 1 dirfd */
if ((int)w.sr.args[0] != AT_FDCWD) { ret = do_strncpy_from_user(fd, pathbuf,
/* dirfd != AT_FDCWD */ (void *)w.sr.args[1],
__dprintf("openat(dirfd != AT_FDCWD)\n"); PATH_MAX);
snprintf(tmpbuf, sizeof(tmpbuf), "/proc/self/fd/%d", (int)w.sr.args[0]); __dprintf("openat(dirfd == AT_FDCWD)\n");
ret = readlink(tmpbuf, pathbuf, sizeof(pathbuf) - 1);
if (ret < 0) {
do_syscall_return(fd, cpu, -errno, 0, 0, 0, 0);
break;
}
__dprintf(" %s -> %s\n", tmpbuf, pathbuf);
ret = do_strncpy_from_user(fd, tmpbuf, (void *)w.sr.args[1], PATH_MAX);
if (ret >= PATH_MAX) { if (ret >= PATH_MAX) {
ret = -ENAMETOOLONG; ret = -ENAMETOOLONG;
} }
@@ -3231,19 +3224,43 @@ int main_loop(struct thread_data_s *my_thread)
do_syscall_return(fd, cpu, ret, 0, 0, 0, 0); do_syscall_return(fd, cpu, ret, 0, 0, 0, 0);
break; break;
} }
if ((int)w.sr.args[0] != AT_FDCWD &&
pathbuf[0] != '/') {
/* dirfd != AT_FDCWD */
__dprintf("openat(dirfd != AT_FDCWD)\n");
snprintf(tmpbuf, sizeof(tmpbuf),
"/proc/self/fd/%d", (int)w.sr.args[0]);
ret = readlink(tmpbuf, pathbuf,
sizeof(pathbuf) - 1);
if (ret == -1 &&
(errno == ENOENT ||
errno == EINVAL)) {
do_syscall_return(fd, cpu, -EBADF, 0, 0,
0, 0);
break;
}
if (ret < 0) {
do_syscall_return(fd, cpu, -errno, 0, 0,
0, 0);
break;
}
__dprintf(" %s -> %s\n", tmpbuf, pathbuf);
ret = do_strncpy_from_user(fd, tmpbuf,
(void *)w.sr.args[1],
PATH_MAX);
if (ret >= PATH_MAX) {
ret = -ENAMETOOLONG;
}
if (ret < 0) {
do_syscall_return(fd, cpu, ret, 0, 0, 0,
0);
break;
}
strncat(pathbuf, "/", 1); strncat(pathbuf, "/", 1);
strncat(pathbuf, tmpbuf, strlen(tmpbuf) + 1); strncat(pathbuf, tmpbuf, strlen(tmpbuf) + 1);
} else {
/* dirfd == AT_FDCWD */
__dprintf("openat(dirfd == AT_FDCWD)\n");
ret = do_strncpy_from_user(fd, pathbuf, (void *)w.sr.args[1], PATH_MAX);
if (ret >= PATH_MAX) {
ret = -ENAMETOOLONG;
}
if (ret < 0) {
do_syscall_return(fd, cpu, ret, 0, 0, 0, 0);
break;
} }
else {
} }
__dprintf("openat: %s\n", pathbuf); __dprintf("openat: %s\n", pathbuf);

1
kernel/syscall.c
View File

@@ -9481,3 +9481,4 @@ long syscall(int num, ihk_mc_user_context_t *ctx)
return l; return l;
} }

17
lib/string.c
View File

@@ -354,19 +354,4 @@ int flatten_strings_from_user(int nr_strings, char *first, char **strings, char
p = strchr(p, '\0') + 1; p = strchr(p, '\0') + 1;
} }
for (string_i = 0; string_i < nr_strings; ++string_i) { for (string_i = 0; string_i < nr_strings; ++string_
char *userp;
_flat[n++] = p - (char *)_flat;
ret = getlong_user((long *)&userp, (void *)(strings + string_i));
if (ret < 0)
return ret;
strcpy_from_user(p, userp);
p = strchr(p, '\0') + 1;
}
_flat[n] = 0;
*flat = (char *)_flat;
return full_len;
}