diff options
author | Alice Frosi <afrosi@redhat.com> | 2023-05-02 17:21:57 +0200 |
---|---|---|
committer | Alice Frosi <afrosi@redhat.com> | 2023-05-08 14:36:43 +0200 |
commit | c29157e78df7fa335c56d0d7f2cca7dc50bfffd6 (patch) | |
tree | 6c7ce428c01a602f89c8897015e7428b84038871 /operations.h | |
parent | 82b77505f9420f11d614c2ae0f74153ca4ee3cb5 (diff) | |
download | seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar.gz seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar.bz2 seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar.lz seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar.xz seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.tar.zst seitan-c29157e78df7fa335c56d0d7f2cca7dc50bfffd6.zip |
seitan: refactor operations
Refactoring:
- rename do_operations to eval and reduce the number of arguments
- create macro HANDLE_OP
- rename all functions with op_*(operation name)
- exposed the op_* functions in the operations.h
Fixes:
- use pread for op_load
Diffstat (limited to 'operations.h')
-rw-r--r-- | operations.h | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/operations.h b/operations.h index ecb6414..011369a 100644 --- a/operations.h +++ b/operations.h @@ -9,8 +9,23 @@ #include <errno.h> #include <linux/seccomp.h> +#include "common/gluten.h" +#include "common/util.h" + #define STACK_SIZE (1024 * 1024 / 8) #define NS_NUM (sizeof(enum ns_type)) +#define HANDLE_OP(code, call, type) \ + case code: \ + do { \ + int res = call(req, notifier, g, &op->op.type); \ + if (res == 0) \ + (op)++; \ + else if (res == -1) \ + (op) = NULL; \ + else \ + (op) += res; \ + } while (0); \ + break struct arg_clone { const struct op_call *args; @@ -20,7 +35,24 @@ struct arg_clone { }; int do_call(struct arg_clone *c); -int do_operations(struct gluten *g, struct op operations[], - struct seccomp_notif *req, - unsigned int n_operations, int notifyfd); +void eval(struct gluten *g, struct op *ops, const struct seccomp_notif *req, + int notifier); +int op_call(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_call *op); +int op_block(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_block *op); +int op_return(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_return *op); +int op_continue(const struct seccomp_notif *req, int notifier, struct gluten *g, + void *); +int op_inject(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_inject *op); +int op_inject_a(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_inject *op); +int op_cmp(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_cmp *op); +int op_resolve_fd(const struct seccomp_notif *req, int notifier, + struct gluten *g, struct op_resolvedfd *op); +int op_load(const struct seccomp_notif *req, int notifier, struct gluten *g, + struct op_load *load); #endif /* ACTIONS_H */ |