mirror of
https://passt.top/passt
synced 2025-08-15 03:03:14 +02:00
Move self-isolation code into a separate file
passt/pasta contains a number of routines designed to isolate passt from the rest of the system for security. These are spread through util.c and passt.c. Move them together into a new isolation.c file. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
5d3b50c100
commit
d72a1e7bb9
8 changed files with 189 additions and 169 deletions
51
util.c
51
util.c
|
@ -13,30 +13,17 @@
|
|||
*/
|
||||
|
||||
#include <sched.h>
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <net/ethernet.h>
|
||||
#include <net/if.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <netinet/udp.h>
|
||||
#include <sys/epoll.h>
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <syslog.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
|
||||
#include <linux/capability.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "passt.h"
|
||||
|
@ -467,44 +454,6 @@ void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns,
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* drop_caps() - Drop capabilities we might have except for CAP_NET_BIND_SERVICE
|
||||
*/
|
||||
void drop_caps(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 64; i++) {
|
||||
if (i == CAP_NET_BIND_SERVICE)
|
||||
continue;
|
||||
|
||||
prctl(PR_CAPBSET_DROP, i, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* drop_root() - Switch to given UID and GID
|
||||
* @uid: User ID to switch to
|
||||
* @gid: Group ID to switch to
|
||||
*/
|
||||
void drop_root(uid_t uid, gid_t gid)
|
||||
{
|
||||
if (setgroups(0, NULL)) {
|
||||
/* If we don't start with CAP_SETGID, this will EPERM */
|
||||
if (errno != EPERM) {
|
||||
err("Can't drop supplementary groups: %s",
|
||||
strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (!setgid(gid) && !setuid(uid))
|
||||
return;
|
||||
|
||||
err("Can't change user/group, exiting");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/**
|
||||
* ns_enter() - Enter configured user (unless already joined) and network ns
|
||||
* @c: Execution context
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue