Unverified Commit 6cc2df8e authored by Mickaël Salaün's avatar Mickaël Salaün
Browse files

landlock: Add clang-format exceptions 

In preparation to a following commit, add clang-format on and
clang-format off stanzas around constant definitions.  This enables to
keep aligned values, which is much more readable than packed
definitions.

Link: https://lore.kernel.org/r/20220506160513.523257-2-mic@digikod.net


Cc: stable@vger.kernel.org
Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
parent 672c0c51

include/uapi/linux/landlock.h

+4 −0
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ struct landlock_ruleset_attr { 
 * - %LANDLOCK_CREATE_RULESET_VERSION: Get the highest supported Landlock ABI

 *   version.

 */

/* clang-format off */

#define LANDLOCK_CREATE_RULESET_VERSION			(1U << 0)

/* clang-format on */



/**

 * enum landlock_rule_type - Landlock rule type
@@ -120,6 +122,7 @@ struct landlock_path_beneath_attr { 
 *   :manpage:`access(2)`.

 *   Future Landlock evolutions will enable to restrict them.

 */

/* clang-format off */

#define LANDLOCK_ACCESS_FS_EXECUTE			(1ULL << 0)

#define LANDLOCK_ACCESS_FS_WRITE_FILE			(1ULL << 1)

#define LANDLOCK_ACCESS_FS_READ_FILE			(1ULL << 2)
@@ -133,5 +136,6 @@ struct landlock_path_beneath_attr { 
#define LANDLOCK_ACCESS_FS_MAKE_FIFO			(1ULL << 10)

#define LANDLOCK_ACCESS_FS_MAKE_BLOCK			(1ULL << 11)

#define LANDLOCK_ACCESS_FS_MAKE_SYM			(1ULL << 12)

/* clang-format on */



#endif /* _UAPI_LINUX_LANDLOCK_H */

security/landlock/fs.c

+2 −0
Original line number Diff line number Diff line
@@ -141,10 +141,12 @@ static struct landlock_object *get_inode_object(struct inode *const inode) 
}



/* All access rights that can be tied to files. */

/* clang-format off */

#define ACCESS_FILE ( \

	LANDLOCK_ACCESS_FS_EXECUTE | \

	LANDLOCK_ACCESS_FS_WRITE_FILE | \

	LANDLOCK_ACCESS_FS_READ_FILE)

/* clang-format on */



/*

 * @path: Should have been checked by get_path_from_fd().

security/landlock/limits.h

+4 −0
Original line number Diff line number Diff line
@@ -12,10 +12,14 @@ 
#include <linux/limits.h>

#include <uapi/linux/landlock.h>



/* clang-format off */



#define LANDLOCK_MAX_NUM_LAYERS		64

#define LANDLOCK_MAX_NUM_RULES		U32_MAX



#define LANDLOCK_LAST_ACCESS_FS		LANDLOCK_ACCESS_FS_MAKE_SYM

#define LANDLOCK_MASK_ACCESS_FS		((LANDLOCK_LAST_ACCESS_FS << 1) - 1)



/* clang-format on */



#endif /* _SECURITY_LANDLOCK_LIMITS_H */