lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 668/772] landlock: Add clang-format exceptions
    Date
    From: Mickaël Salaün <mic@digikod.net>

    commit 6cc2df8e3a3967e7c13a424f87f6efb1d4a62d80 upstream.

    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: Mickaël Salaün <mic@digikod.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/uapi/linux/landlock.h | 4 ++++
    security/landlock/fs.c | 2 ++
    security/landlock/limits.h | 4 ++++
    3 files changed, 10 insertions(+)

    --- a/include/uapi/linux/landlock.h
    +++ b/include/uapi/linux/landlock.h
    @@ -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 */
    --- a/security/landlock/fs.c
    +++ b/security/landlock/fs.c
    @@ -141,10 +141,12 @@ retry:
    }

    /* 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().
    --- a/security/landlock/limits.h
    +++ b/security/landlock/limits.h
    @@ -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 */

    \
     
     \ /
      Last update: 2022-06-07 23:51    [W:2.472 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site