proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-26 13:16:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2347 from brauner/2018-05-24/seccomp_cleanups

Browse Source 
seccomp: cleanup
This commit is contained in:
Stéphane Graber 2018-05-24 16:57:13 -04:00 committed by GitHub
commit b3365b9346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 318 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lxc/lxccontainer.c
View File

@ -2684,15 +2684,6 @@ out:
return bret; return bret;
} }
static void strip_newline(char *p)
{
size_t len = strlen(p);
if (len < 1)
return;
if (p[len-1] == '\n')
p[len-1] = '\0';
}
void mod_all_rdeps(struct lxc_container *c, bool inc) void mod_all_rdeps(struct lxc_container *c, bool inc)
{ {
struct lxc_container *p; struct lxc_container *p;
@ -2715,8 +2706,10 @@ void mod_all_rdeps(struct lxc_container *c, bool inc)
ERROR("badly formatted file %s", path); ERROR("badly formatted file %s", path);
goto out; goto out;
} }
strip_newline(lxcpath);
strip_newline(lxcname); remove_trailing_newlines(lxcpath);
remove_trailing_newlines(lxcname);
if ((p = lxc_container_new(lxcname, lxcpath)) == NULL) { if ((p = lxc_container_new(lxcname, lxcpath)) == NULL) {
ERROR("Unable to find dependent container %s:%s", ERROR("Unable to find dependent container %s:%s",
lxcpath, lxcname); lxcpath, lxcname);

21
src/lxc/lxcseccomp.h
View File

@ -27,23 +27,24 @@
#include "conf.h" #include "conf.h"
#ifdef HAVE_SECCOMP #ifdef HAVE_SECCOMP
int lxc_seccomp_load(struct lxc_conf *conf); extern int lxc_seccomp_load(struct lxc_conf *conf);
int lxc_read_seccomp_config(struct lxc_conf *conf); extern int lxc_read_seccomp_config(struct lxc_conf *conf);
void lxc_seccomp_free(struct lxc_conf *conf); extern void lxc_seccomp_free(struct lxc_conf *conf);
#else #else
static inline int lxc_seccomp_load(struct lxc_conf *conf) { static inline int lxc_seccomp_load(struct lxc_conf *conf)
{
return 0; return 0;
} }
static inline int lxc_read_seccomp_config(struct lxc_conf *conf) { static inline int lxc_read_seccomp_config(struct lxc_conf *conf)
{
return 0; return 0;
} }
static inline void lxc_seccomp_free(struct lxc_conf *conf) { static inline void lxc_seccomp_free(struct lxc_conf *conf)
if (conf->seccomp) { {
free(conf->seccomp); free(conf->seccomp);
conf->seccomp = NULL; conf->seccomp = NULL;
}
} }
#endif #endif

478
src/lxc/seccomp.c
View File

File diff suppressed because it is too large Load Diff

11
src/lxc/utils.c
View File

@ -2533,3 +2533,14 @@ int lxc_set_death_signal(int signal)
return 0; return 0;
} }
void remove_trailing_newlines(char *l)
{
char *p = l;
while (*p)
p++;
while (--p >= l && *p == '\n')
*p = '\0';
}

1
src/lxc/utils.h
View File

@ -453,6 +453,7 @@ extern void lxc_free_array(void **array, lxc_free_fn element_free_fn);
extern size_t lxc_array_len(void **array); extern size_t lxc_array_len(void **array);
extern void **lxc_append_null_to_array(void **array, size_t count); extern void **lxc_append_null_to_array(void **array, size_t count);
extern void remove_trailing_newlines(char *l);
/* initialize rand with urandom */ /* initialize rand with urandom */
extern int randseed(bool); extern int randseed(bool);