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

Merge pull request #3059 from brauner/2019-06-21/seccomp_notify

Browse Source 
lxccontainer: rework seccomp notify api function
This commit is contained in:
Stéphane Graber 2019-07-01 22:04:20 -04:00 committed by GitHub
commit dfce2c76be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxccontainer.c
View File

@ -5248,23 +5248,15 @@ out:
return ret; return ret;
} }
static int do_lxcapi_seccomp_notify(struct lxc_container *c, unsigned int cmd, int fd) static int do_lxcapi_seccomp_notify_fd(struct lxc_container *c)
{ {
if (!c || !c->lxc_conf) if (!c || !c->lxc_conf)
return minus_one_set_errno(-EINVAL); return minus_one_set_errno(-EINVAL);
switch (cmd) { return lxc_seccomp_get_notify_fd(&c->lxc_conf->seccomp);
case LXC_SECCOMP_NOTIFY_GET_FD:
if (fd)
return minus_one_set_errno(EINVAL);
return lxc_seccomp_get_notify_fd(&c->lxc_conf->seccomp);
}
return minus_one_set_errno(EINVAL);
} }
WRAP_API_2(int, lxcapi_seccomp_notify, unsigned int, int) WRAP_API(int, lxcapi_seccomp_notify_fd)
struct lxc_container *lxc_container_new(const char *name, const char *configpath) struct lxc_container *lxc_container_new(const char *name, const char *configpath)
{ {
@ -5405,7 +5397,7 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
c->console_log = lxcapi_console_log; c->console_log = lxcapi_console_log;
c->mount = lxcapi_mount; c->mount = lxcapi_mount;
c->umount = lxcapi_umount; c->umount = lxcapi_umount;
c->seccomp_notify = lxcapi_seccomp_notify; c->seccomp_notify_fd = lxcapi_seccomp_notify_fd;
return c; return c;

7
src/lxc/lxccontainer.h
View File

@ -60,11 +60,6 @@ struct lxc_mount {
int version; int version;
}; };
enum {
LXC_SECCOMP_NOTIFY_GET_FD = 0,
LXC_SECCOMP_NOTIFY_MAX,
};
/*! /*!
* An LXC container. * An LXC container.
* *
@ -873,7 +868,7 @@ struct lxc_container {
int (*umount)(struct lxc_container *c, const char *target, int (*umount)(struct lxc_container *c, const char *target,
unsigned long mountflags, struct lxc_mount *mnt); unsigned long mountflags, struct lxc_mount *mnt);
int (*seccomp_notify)(struct lxc_container *c, unsigned int cmd, int fd); int (*seccomp_notify_fd)(struct lxc_container *c);
}; };
/*! /*!