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

util: remove unused functions

Browse Source
This commit is contained in:
Robert Swiecki 2018-02-10 23:54:36 +01:00
parent 7a55ffb3a6
commit b7f0acb021
4 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.cc
View File

@ -246,6 +246,7 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig&
} }
for (ssize_t i = 0; i < njc.seccomp_string().size(); i++) { for (ssize_t i = 0; i < njc.seccomp_string().size(); i++) {
nsjconf->kafel_string += njc.seccomp_string(i); nsjconf->kafel_string += njc.seccomp_string(i);
nsjconf->kafel_string += '\n';
} }
nsjconf->cgroup_mem_max = njc.cgroup_mem_max(); nsjconf->cgroup_mem_max = njc.cgroup_mem_max();

2
sandbox.cc
View File

@ -72,8 +72,10 @@ bool preparePolicy(nsjconf_t* nsjconf) {
kafel_ctxt_t ctxt = kafel_ctxt_create(); kafel_ctxt_t ctxt = kafel_ctxt_create();
if (f) { if (f) {
LOG_D("Compiling seccomp policy from file: '%s'", nsjconf->kafel_file_path.c_str());
kafel_set_input_file(ctxt, f); kafel_set_input_file(ctxt, f);
} else if (!nsjconf->kafel_string.empty()) { } else if (!nsjconf->kafel_string.empty()) {
LOG_D("Compiling seccomp policy from string: '%s'", nsjconf->kafel_string.c_str());
kafel_set_input_string(ctxt, nsjconf->kafel_string.c_str()); kafel_set_input_string(ctxt, nsjconf->kafel_string.c_str());
} else { } else {
LOG_F( LOG_F(

52
util.cc
View File

@ -47,50 +47,15 @@
namespace util { namespace util {
void* memAlloc(size_t sz) {
void* ret = malloc(sz);
if (ret == NULL) {
LOG_F("malloc(sz=%zu) failed", sz);
}
return ret;
}
void* clearAlloc(size_t sz) {
void* r = malloc(sz);
memset(r, '\0', sz);
return r;
}
char* strDup(const char* str) {
if (str == NULL) {
return NULL;
}
char* ret = strdup(str);
if (ret == NULL) {
LOG_E("Cannot allocate memory for strdup(sz=%zu)", strlen(str));
}
return ret;
}
uint8_t* memDup(const uint8_t* src, size_t len) {
if (src == NULL) {
return NULL;
}
uint8_t* ret = reinterpret_cast<uint8_t*>(malloc(len));
memcpy(ret, src, len);
return ret;
}
ssize_t readFromFd(int fd, void* buf, size_t len) { ssize_t readFromFd(int fd, void* buf, size_t len) {
uint8_t* charbuf = (uint8_t*)buf; uint8_t* charbuf = (uint8_t*)buf;
size_t readSz = 0; size_t readSz = 0;
while (readSz < len) { while (readSz < len) {
ssize_t sz = read(fd, &charbuf[readSz], len - readSz); ssize_t sz = TEMP_FAILURE_RETRY(read(fd, &charbuf[readSz], len - readSz));
if (sz < 0 && errno == EINTR) continue; if (sz <= 0) {
break;
if (sz <= 0) break; }
readSz += sz; readSz += sz;
} }
return readSz; return readSz;
@ -113,11 +78,10 @@ ssize_t writeToFd(int fd, const void* buf, size_t len) {
size_t writtenSz = 0; size_t writtenSz = 0;
while (writtenSz < len) { while (writtenSz < len) {
ssize_t sz = write(fd, &charbuf[writtenSz], len - writtenSz); ssize_t sz = TEMP_FAILURE_RETRY(write(fd, &charbuf[writtenSz], len - writtenSz));
if (sz < 0 && errno == EINTR) continue; if (sz < 0) {
return false;
if (sz < 0) return false; }
writtenSz += sz; writtenSz += sz;
} }
return true; return true;

4
util.h
View File

@ -32,10 +32,6 @@
namespace util { namespace util {
void* memAlloc(size_t sz);
void* clearAlloc(size_t sz);
char* strDup(const char* str);
uint8_t* memDup(const uint8_t* src, size_t len);
ssize_t readFromFd(int fd, void* buf, size_t len); ssize_t readFromFd(int fd, void* buf, size_t len);
ssize_t readFromFile(const char* fname, void* buf, size_t len); ssize_t readFromFile(const char* fname, void* buf, size_t len);
ssize_t writeToFd(int fd, const void* buf, size_t len); ssize_t writeToFd(int fd, const void* buf, size_t len);