mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

nsexec: Add generic receive_sources()

Browse Source 
Future patches will use this with another env var.

Co-authored-by: Francis Laniel <flaniel@linux.microsoft.com>
Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
This commit is contained in:
Rodrigo Campos
2023-02-09 12:55:19 +01:00
parent 4b668a8224
commit 5166164ded
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/nsenter/nsexec.c
+21 -12
View File
@@ -522,26 +522,30 @@ static inline int sane_kill(pid_t pid, int signum)
return 0;
}
void receive_mountsources(int sockfd)
/* receive_fd_sources parses env_var as an array of fd numbers and, for each element that is
* not -1, it receives an fd via SCM_RIGHTS and dup3 it to the fd requested in
* the element of the env var.
*/
void receive_fd_sources(int sockfd, const char *env_var)
{
char *mount_fds, *endp;
char *fds, *endp;
long new_fd;
// This env var must be a json array of ints.
mount_fds = getenv("_LIBCONTAINER_MOUNT_FDS");
fds = getenv(env_var);
if (mount_fds[0] != '[') {
bail("malformed _LIBCONTAINER_MOUNT_FDS env var: missing '['");
if (fds[0] != '[') {
bail("malformed %s env var: missing '['", env_var);
}
mount_fds++;
fds++;
for (endp = mount_fds; *endp != ']'; mount_fds = endp + 1) {
new_fd = strtol(mount_fds, &endp, 10);
if (endp == mount_fds) {
bail("malformed _LIBCONTAINER_MOUNT_FDS env var: not a number");
for (endp = fds; *endp != ']'; fds = endp + 1) {
new_fd = strtol(fds, &endp, 10);
if (endp == fds) {
bail("malformed %s env var: not a number", env_var);
}
if (*endp == '\0') {
bail("malformed _LIBCONTAINER_MOUNT_FDS env var: missing ]");
bail("malformed %s env var: missing ]", env_var);
}
// The list contains -1 when no fd is needed. Ignore them.
if (new_fd == -1) {
@@ -549,7 +553,7 @@ void receive_mountsources(int sockfd)
}
if (new_fd == LONG_MAX || new_fd < 0 || new_fd > INT_MAX) {
bail("malformed _LIBCONTAINER_MOUNT_FDS env var: fds out of range");
bail("malformed %s env var: fds out of range", env_var);
}
int recv_fd = receive_fd(sockfd);
@@ -562,6 +566,11 @@ void receive_mountsources(int sockfd)
}
}
void receive_mountsources(int sockfd)
{
receive_fd_sources(sockfd, "_LIBCONTAINER_MOUNT_FDS");
}
void send_mountsources(int sockfd, pid_t child, char *mountsources, size_t mountsources_len)
{
char proc_path[PATH_MAX];