woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make indent depend

Browse Source
This commit is contained in:
Robert Swiecki 2018-02-11 04:02:43 +01:00
parent ac89fbb44f
commit 7b9178f5d7
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgroup.cc
View File

@ -125,7 +125,8 @@ static bool initNsFromParentNetCls(nsjconf_t* nsjconf, pid_t pid) {
char net_cls_cgroup_path[PATH_MAX];
snprintf(net_cls_cgroup_path, sizeof(net_cls_cgroup_path), "%s/%s/NSJAIL.%d",
nsjconf->cgroup_net_cls_mount.c_str(), nsjconf->cgroup_net_cls_parent.c_str(), (int)pid);
nsjconf->cgroup_net_cls_mount.c_str(), nsjconf->cgroup_net_cls_parent.c_str(),
(int)pid);
LOG_D("Create '%s' for PID=%d", net_cls_cgroup_path, (int)pid);
if (mkdir(net_cls_cgroup_path, 0700) == -1 && errno != EEXIST) {
PLOG_E("mkdir('%s', 0700) failed", net_cls_cgroup_path);
@ -267,7 +268,8 @@ void finishFromParentNetCls(nsjconf_t* nsjconf, pid_t pid) {
}
char net_cls_cgroup_path[PATH_MAX];
snprintf(net_cls_cgroup_path, sizeof(net_cls_cgroup_path), "%s/%s/NSJAIL.%d",
nsjconf->cgroup_net_cls_mount.c_str(), nsjconf->cgroup_net_cls_parent.c_str(), (int)pid);
nsjconf->cgroup_net_cls_mount.c_str(), nsjconf->cgroup_net_cls_parent.c_str(),
(int)pid);
LOG_D("Remove '%s'", net_cls_cgroup_path);
if (rmdir(net_cls_cgroup_path) == -1) {
PLOG_W("rmdir('%s') failed", net_cls_cgroup_path);

4
net.cc
View File

@ -135,7 +135,9 @@ bool initNsFromParent(nsjconf_t* nsjconf, int pid) {
char pid_str[256];
snprintf(pid_str, sizeof(pid_str), "%d", pid);
const std::vector<std::string> argv {"/sbin/ip", "link", "add", "link", (char*)nsjconf->iface_vs.c_str(), "name", IFACE_NAME, "netns", pid_str, "type", "macvlan", "mode", "bridge" };
const std::vector<std::string> argv{"/sbin/ip", "link", "add", "link",
(char*)nsjconf->iface_vs.c_str(), "name", IFACE_NAME, "netns", pid_str, "type",
"macvlan", "mode", "bridge"};
if (subproc::systemExe(argv, environ) != 0) {
LOG_E("Couldn't create MACVTAP interface for '%s'", nsjconf->iface_vs.c_str());
return false;

4
user.cc
View File

@ -156,7 +156,7 @@ static bool gidMapSelf(nsjconf_t* nsjconf, pid_t pid) {
static bool gidMapExternal(nsjconf_t* nsjconf, pid_t pid UNUSED) {
bool use = false;
std::vector<std::string> argv = { "/usr/bin/newgidmap", std::to_string(pid) };
std::vector<std::string> argv = {"/usr/bin/newgidmap", std::to_string(pid)};
for (const auto& gid : nsjconf->gids) {
if (!gid.is_newidmap) {
continue;
@ -182,7 +182,7 @@ static bool gidMapExternal(nsjconf_t* nsjconf, pid_t pid UNUSED) {
static bool uidMapExternal(nsjconf_t* nsjconf, pid_t pid UNUSED) {
bool use = false;
std::vector<std::string> argv = { "/usr/bin/newuidmap", std::to_string(pid) };
std::vector<std::string> argv = {"/usr/bin/newuidmap", std::to_string(pid)};
for (const auto& uid : nsjconf->uids) {
if (!uid.is_newidmap) {
continue;