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

Merge pull request #4201 from kolyshkin/cleanups

Browse Source 
libct/nsenter: rm dead code
This commit is contained in:
Mrunal Patel
2024-02-14 11:04:46 -08:00
committed by GitHub
parent aa8ba5bd59 3a9859bdc0
commit bb56ed9e5f
3 changed files with 0 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/nsenter/ipc.c
-84
View File
@@ -1,84 +0,0 @@
#define _GNU_SOURCE
#include <alloca.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include "ipc.h"
#include "log.h"
int receive_fd(int sockfd)
{
int bytes_read;
struct msghdr msg = { };
struct cmsghdr *cmsg;
struct iovec iov = { };
char null_byte = '\0';
int ret;
int fd_count;
iov.iov_base = &null_byte;
iov.iov_len = 1;
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
msg.msg_controllen = CMSG_SPACE(sizeof(int));
msg.msg_control = malloc(msg.msg_controllen);
if (msg.msg_control == NULL) {
bail("Can't allocate memory to receive fd.");
}
memset(msg.msg_control, 0, msg.msg_controllen);
bytes_read = recvmsg(sockfd, &msg, MSG_CMSG_CLOEXEC);
if (bytes_read != 1)
bail("failed to receive fd from unix socket %d", sockfd);
if (msg.msg_flags & MSG_CTRUNC)
bail("received truncated control message from unix socket %d", sockfd);
cmsg = CMSG_FIRSTHDR(&msg);
if (!cmsg)
bail("received message from unix socket %d without control message", sockfd);
if (cmsg->cmsg_level != SOL_SOCKET)
bail("received unknown control message from unix socket %d: cmsg_level=%d", sockfd, cmsg->cmsg_level);
if (cmsg->cmsg_type != SCM_RIGHTS)
bail("received unknown control message from unix socket %d: cmsg_type=%d", sockfd, cmsg->cmsg_type);
fd_count = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
if (fd_count != 1)
bail("received control message from unix socket %d with too many fds: %d", sockfd, fd_count);
ret = *(int *)CMSG_DATA(cmsg);
free(msg.msg_control);
return ret;
}
int send_fd(int sockfd, int fd)
{
struct msghdr msg = { };
struct cmsghdr *cmsg;
struct iovec iov[1] = { };
char null_byte = '\0';
iov[0].iov_base = &null_byte;
iov[0].iov_len = 1;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
/* We send only one fd as specified by cmsg->cmsg_len below, even
* though msg.msg_controllen might have more space due to alignment. */
msg.msg_controllen = CMSG_SPACE(sizeof(int));
msg.msg_control = alloca(msg.msg_controllen);
memset(msg.msg_control, 0, msg.msg_controllen);
cmsg = CMSG_FIRSTHDR(&msg);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
return sendmsg(sockfd, &msg, 0);
}
libcontainer/nsenter/ipc.h
-12
View File
@@ -1,12 +0,0 @@
#ifndef NSENTER_IPC_H
#define NSENTER_IPC_H
int receive_fd(int sockfd);
/*
* send_fd passes the open file descriptor fd to another process via the UNIX
* domain socket sockfd. The return value of the sendmsg(2) call is returned.
*/
int send_fd(int sockfd, int fd);
#endif /* NSENTER_IPC_H */
libcontainer/nsenter/nsexec.c
-2
View File
@@ -4,7 +4,6 @@
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
#include <limits.h>
#include <sched.h>
#include <setjmp.h>
#include <signal.h>
@@ -28,7 +27,6 @@
#include <linux/types.h>
#include "getenv.h"
#include "ipc.h"
#include "log.h"
/* Get all of the CLONE_NEW* flags. */
#include "namespace.h"