Run `cros format` on .c, .h, and .cc files
This also includes
clang-format -i --style:file:../../platform2/.clang-format \
*.cc
BUG=None
TEST=cros format --include '*.py' \
--exclude 'linux-x86/*.gen.c' \
--exclude 'test_util.h' \
--exclude 'unittest_util.h' \
--include '*.[ch]' \
--exclude '*' .
Change-Id: Ia195b75d930a69ccc73365ca33cd43e91d87f8ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minijail/+/4996919
Commit-Queue: Allen Webb <[email protected]>
Tested-by: Allen Webb <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
diff --git a/landlock_util.h b/landlock_util.h
index 4f6d0c4..147053b 100644
--- a/landlock_util.h
+++ b/landlock_util.h
@@ -17,7 +17,6 @@
#include "landlock.h"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -34,46 +33,35 @@
#define __NR_landlock_restrict_self 446
#endif
-#define ACCESS_FS_ROUGHLY_READ ( \
- LANDLOCK_ACCESS_FS_READ_FILE | \
- LANDLOCK_ACCESS_FS_READ_DIR)
+#define ACCESS_FS_ROUGHLY_READ \
+ (LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR)
-#define ACCESS_FS_ROUGHLY_READ_EXECUTE ( \
- LANDLOCK_ACCESS_FS_EXECUTE | \
- LANDLOCK_ACCESS_FS_READ_FILE | \
- LANDLOCK_ACCESS_FS_READ_DIR)
+#define ACCESS_FS_ROUGHLY_READ_EXECUTE \
+ (LANDLOCK_ACCESS_FS_EXECUTE | LANDLOCK_ACCESS_FS_READ_FILE | \
+ LANDLOCK_ACCESS_FS_READ_DIR)
-#define ACCESS_FS_ROUGHLY_BASIC_WRITE ( \
- LANDLOCK_ACCESS_FS_WRITE_FILE | \
- LANDLOCK_ACCESS_FS_REMOVE_DIR | \
- LANDLOCK_ACCESS_FS_REMOVE_FILE | \
- LANDLOCK_ACCESS_FS_MAKE_DIR | \
- LANDLOCK_ACCESS_FS_MAKE_REG)
+#define ACCESS_FS_ROUGHLY_BASIC_WRITE \
+ (LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | \
+ LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_MAKE_DIR | \
+ LANDLOCK_ACCESS_FS_MAKE_REG)
-#define ACCESS_FS_ROUGHLY_EDIT ( \
- LANDLOCK_ACCESS_FS_WRITE_FILE | \
- LANDLOCK_ACCESS_FS_REMOVE_DIR | \
- LANDLOCK_ACCESS_FS_REMOVE_FILE)
+#define ACCESS_FS_ROUGHLY_EDIT \
+ (LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | \
+ LANDLOCK_ACCESS_FS_REMOVE_FILE)
-#define ACCESS_FS_ROUGHLY_FULL_WRITE ( \
- LANDLOCK_ACCESS_FS_WRITE_FILE | \
- LANDLOCK_ACCESS_FS_REMOVE_DIR | \
- LANDLOCK_ACCESS_FS_REMOVE_FILE | \
- LANDLOCK_ACCESS_FS_MAKE_CHAR | \
- LANDLOCK_ACCESS_FS_MAKE_DIR | \
- LANDLOCK_ACCESS_FS_MAKE_REG | \
- LANDLOCK_ACCESS_FS_MAKE_SOCK | \
- LANDLOCK_ACCESS_FS_MAKE_FIFO | \
- LANDLOCK_ACCESS_FS_MAKE_BLOCK | \
- LANDLOCK_ACCESS_FS_MAKE_SYM)
+#define ACCESS_FS_ROUGHLY_FULL_WRITE \
+ (LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | \
+ LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_MAKE_CHAR | \
+ LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | \
+ LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | \
+ LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM)
-#define ACCESS_FILE ( \
- LANDLOCK_ACCESS_FS_EXECUTE | \
- LANDLOCK_ACCESS_FS_WRITE_FILE | \
- LANDLOCK_ACCESS_FS_READ_FILE)
+#define ACCESS_FILE \
+ (LANDLOCK_ACCESS_FS_EXECUTE | LANDLOCK_ACCESS_FS_WRITE_FILE | \
+ LANDLOCK_ACCESS_FS_READ_FILE)
-#define HANDLED_ACCESS_TYPES (ACCESS_FS_ROUGHLY_READ_EXECUTE | \
- ACCESS_FS_ROUGHLY_FULL_WRITE)
+#define HANDLED_ACCESS_TYPES \
+ (ACCESS_FS_ROUGHLY_READ_EXECUTE | ACCESS_FS_ROUGHLY_FULL_WRITE)
#define LANDLOCK_ABI_FS_REFER_SUPPORTED 2
@@ -83,9 +71,9 @@
* Returns the ruleset file descriptor on success, returns an error code
* otherwise.
*/
-extern int landlock_create_ruleset(const struct
- minijail_landlock_ruleset_attr *const attr,
- const size_t size, const __u32 flags);
+extern int
+landlock_create_ruleset(const struct minijail_landlock_ruleset_attr *const attr,
+ const size_t size, const __u32 flags);
/* Performs Landlock add rule syscall. */
extern int landlock_add_rule(const int ruleset_fd,
@@ -93,8 +81,7 @@
const void *const rule_attr, const __u32 flags);
/* Performs Landlock restrict self syscall. */
-extern int landlock_restrict_self(const int ruleset_fd,
- const __u32 flags);
+extern int landlock_restrict_self(const int ruleset_fd, const __u32 flags);
/* Populates the landlock ruleset for a path and any needed paths beneath. */
extern bool populate_ruleset_internal(const char *const path,
