diff options
| author |  netblue30 <netblue30@protonmail.com> | 2023-02-24 20:44:48 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-02-24 20:44:48 -0500 |
| commit | d657245f7353f692c22db2801ac64f7d807eb415 (patch) | |
| tree | 5494cbde66f9fb6220df8a72415a6160f130a6b9 /src/include | |
| parent | Merge pull request #5677 from kmk3/print-failed-long-arg (diff) | |
| parent | editorconfig: add indentation rules (diff) | |
| download | firejail-d657245f7353f692c22db2801ac64f7d807eb415.tar.gz firejail-d657245f7353f692c22db2801ac64f7d807eb415.tar.zst firejail-d657245f7353f692c22db2801ac64f7d807eb415.zip | |
Merge pull request #5674 from kmk3/fix-ws-add-editorconfig
build: Fix whitespace and add .editorconfig
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/gcov_wrapper.h | 4 | ||||
| -rw-r--r-- | src/include/seccomp.h | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/include/gcov_wrapper.h b/src/include/gcov_wrapper.h index b56b4e736..7c8f89d59 100644 --- a/src/include/gcov_wrapper.h +++ b/src/include/gcov_wrapper.h | |||
| @@ -33,8 +33,8 @@ | |||
| 33 | */ | 33 | */ |
| 34 | #if __GNUC__ > 11 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1) | 34 | #if __GNUC__ > 11 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1) |
| 35 | static void __gcov_flush(void) { | 35 | static void __gcov_flush(void) { |
| 36 | __gcov_dump(); | 36 | __gcov_dump(); |
| 37 | __gcov_reset(); | 37 | __gcov_reset(); |
| 38 | } | 38 | } |
| 39 | #endif | 39 | #endif |
| 40 | #else | 40 | #else |
diff --git a/src/include/seccomp.h b/src/include/seccomp.h index ef3fe6c3a..fc07b75ce 100644 --- a/src/include/seccomp.h +++ b/src/include/seccomp.h | |||
| @@ -194,24 +194,24 @@ | |||
| 194 | #endif | 194 | #endif |
| 195 | 195 | ||
| 196 | #define VALIDATE_ARCHITECTURE \ | 196 | #define VALIDATE_ARCHITECTURE \ |
| 197 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ | 197 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ |
| 198 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \ | 198 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \ |
| 199 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) | 199 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) |
| 200 | 200 | ||
| 201 | #define VALIDATE_ARCHITECTURE_KILL \ | 201 | #define VALIDATE_ARCHITECTURE_KILL \ |
| 202 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ | 202 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ |
| 203 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \ | 203 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \ |
| 204 | KILL_OR_RETURN_ERRNO | 204 | KILL_OR_RETURN_ERRNO |
| 205 | 205 | ||
| 206 | #define VALIDATE_ARCHITECTURE_64 \ | 206 | #define VALIDATE_ARCHITECTURE_64 \ |
| 207 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ | 207 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ |
| 208 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \ | 208 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_64, 1, 0), \ |
| 209 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) | 209 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) |
| 210 | 210 | ||
| 211 | #define VALIDATE_ARCHITECTURE_32 \ | 211 | #define VALIDATE_ARCHITECTURE_32 \ |
| 212 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ | 212 | BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \ |
| 213 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \ | 213 | BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_32, 1, 0), \ |
| 214 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) | 214 | BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW) |
| 215 | 215 | ||
| 216 | #ifndef X32_SYSCALL_BIT | 216 | #ifndef X32_SYSCALL_BIT |
| 217 | #define X32_SYSCALL_BIT 0x40000000 | 217 | #define X32_SYSCALL_BIT 0x40000000 |