From: Christian Brauner Date: Tue, 11 Jun 2019 21:36:56 +0000 (+0200) Subject: seccomp: s/HAVE_DECL_SECCOMP_NOTIF_GET_FD/HAVE_DECL_SECCOMP_NOTIFY_FD/g X-Git-Tag: lxc-3.2.0~34^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d2d2d9a5077250b5d1f0b36d4764c751118503;p=thirdparty%2Flxc.git seccomp: s/HAVE_DECL_SECCOMP_NOTIF_GET_FD/HAVE_DECL_SECCOMP_NOTIFY_FD/g Align with upstream libseccomp. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/lxcseccomp.h b/src/lxc/lxcseccomp.h index 85bccd214..893b8887d 100644 --- a/src/lxc/lxcseccomp.h +++ b/src/lxc/lxcseccomp.h @@ -32,7 +32,7 @@ #include #include #endif -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD #include #include #endif @@ -48,7 +48,7 @@ struct lxc_handler; #ifdef HAVE_SECCOMP -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD struct seccomp_notify_proxy_msg { uint32_t version; @@ -69,7 +69,7 @@ struct seccomp_notify { #define HAVE_SECCOMP_NOTIFY 1 -#endif /* HAVE_DECL_SECCOMP_NOTIF_GET_FD */ +#endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */ struct lxc_seccomp { char *seccomp; @@ -78,9 +78,9 @@ struct lxc_seccomp { scmp_filter_ctx seccomp_ctx; #endif /* HAVE_SCMP_FILTER_CTX */ -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD struct seccomp_notify notifier; -#endif /* HAVE_DECL_SECCOMP_NOTIF_GET_FD */ +#endif /* HAVE_DECL_SECCOMP_NOTIFY_FD */ }; extern int lxc_seccomp_load(struct lxc_conf *conf); @@ -100,7 +100,7 @@ extern int lxc_seccomp_add_notifier(const char *name, const char *lxcpath, struct lxc_seccomp *seccomp); static inline int lxc_seccomp_get_notify_fd(struct lxc_seccomp *seccomp) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD return seccomp->notifier.notify_fd; #else errno = ENOSYS; diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c index 019d68718..5edaa780c 100644 --- a/src/lxc/seccomp.c +++ b/src/lxc/seccomp.c @@ -92,7 +92,7 @@ static const char *get_action_name(uint32_t action) return "trap"; case SCMP_ACT_ERRNO(0): return "errno"; -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD case SCMP_ACT_NOTIFY: return "notify"; #endif @@ -125,7 +125,7 @@ static uint32_t get_v2_default_action(char *line) ret_action = SCMP_ACT_ALLOW; } else if (strncmp(line, "trap", 4) == 0) { ret_action = SCMP_ACT_TRAP; -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD } else if (strncmp(line, "notify", 6) == 0) { ret_action = SCMP_ACT_NOTIFY; #endif @@ -941,7 +941,7 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c goto bad_rule; } -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if ((rule.action == SCMP_ACT_NOTIFY) && !conf->seccomp.notifier.wants_supervision) { ret = seccomp_attr_set(conf->seccomp.seccomp_ctx, @@ -1256,7 +1256,7 @@ int lxc_seccomp_load(struct lxc_conf *conf) } #endif -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if (conf->seccomp.notifier.wants_supervision) { ret = seccomp_notify_fd(conf->seccomp.seccomp_ctx); if (ret < 0) { @@ -1283,7 +1283,7 @@ void lxc_seccomp_free(struct lxc_seccomp *seccomp) } #endif -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD close_prot_errno_disarm(seccomp->notifier.notify_fd); close_prot_errno_disarm(seccomp->notifier.proxy_fd); seccomp_notify_free(seccomp->notifier.req_buf, seccomp->notifier.rsp_buf); @@ -1292,7 +1292,7 @@ void lxc_seccomp_free(struct lxc_seccomp *seccomp) #endif } -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD static int seccomp_notify_reconnect(struct lxc_handler *handler) { __do_close_prot_errno int notify_fd = -EBADF; @@ -1315,7 +1315,7 @@ static int seccomp_notify_reconnect(struct lxc_handler *handler) } #endif -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD static int seccomp_notify_default_answer(int fd, struct seccomp_notif *req, struct seccomp_notif_resp *resp, struct lxc_handler *handler) @@ -1334,7 +1334,7 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data, struct lxc_epoll_descr *descr) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD __do_close_prot_errno int fd_mem = -EBADF; int reconnect_count, ret; ssize_t bytes; @@ -1425,7 +1425,7 @@ void seccomp_conf_init(struct lxc_conf *conf) conf->seccomp.allow_nesting = 0; memset(&conf->seccomp.seccomp_ctx, 0, sizeof(conf->seccomp.seccomp_ctx)); #endif /* HAVE_SCMP_FILTER_CTX */ -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD conf->seccomp.notifier.wants_supervision = false; conf->seccomp.notifier.notify_fd = -EBADF; conf->seccomp.notifier.proxy_fd = -EBADF; @@ -1440,7 +1440,7 @@ int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp, struct lxc_epoll_descr *descr, struct lxc_handler *handler) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if (seccomp->notifier.wants_supervision && seccomp->notifier.proxy_addr.sun_path[1] != '\0') { __do_close_prot_errno int notify_fd = -EBADF; @@ -1484,7 +1484,7 @@ int lxc_seccomp_setup_proxy(struct lxc_seccomp *seccomp, int lxc_seccomp_send_notifier_fd(struct lxc_seccomp *seccomp, int socket_fd) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if (seccomp->notifier.wants_supervision) { if (lxc_abstract_unix_send_fds(socket_fd, &seccomp->notifier.notify_fd, 1, @@ -1498,7 +1498,7 @@ int lxc_seccomp_send_notifier_fd(struct lxc_seccomp *seccomp, int socket_fd) int lxc_seccomp_recv_notifier_fd(struct lxc_seccomp *seccomp, int socket_fd) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if (seccomp->notifier.wants_supervision) { int ret; @@ -1516,7 +1516,7 @@ int lxc_seccomp_add_notifier(const char *name, const char *lxcpath, struct lxc_seccomp *seccomp) { -#if HAVE_DECL_SECCOMP_NOTIF_GET_FD +#if HAVE_DECL_SECCOMP_NOTIFY_FD if (seccomp->notifier.wants_supervision) { int ret;