lkml.org 
[lkml]   [2022]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v12 04/10] KEYS: Move KEY_LOOKUP_ to include/linux/key.h
    Date
    From: Roberto Sassu <roberto.sassu@huawei.com>

    In preparation for the patch that introduces the bpf_lookup_user_key() eBPF
    kfunc, move KEY_LOOKUP_ definitions to include/linux/key.h, to be able to
    validate the kfunc parameters.

    Also, introduce key_lookup_flags_check() directly in include/linux/key.h,
    to reduce the risk that the check is not in sync with currently defined
    flags.

    Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
    Reviewed-by: KP Singh <kpsingh@kernel.org>
    ---
    include/linux/key.h | 11 +++++++++++
    security/keys/internal.h | 2 --
    2 files changed, 11 insertions(+), 2 deletions(-)

    diff --git a/include/linux/key.h b/include/linux/key.h
    index 7febc4881363..b5bbae77a9e7 100644
    --- a/include/linux/key.h
    +++ b/include/linux/key.h
    @@ -88,6 +88,17 @@ enum key_need_perm {
    KEY_DEFER_PERM_CHECK, /* Special: permission check is deferred */
    };

    +#define KEY_LOOKUP_CREATE 0x01
    +#define KEY_LOOKUP_PARTIAL 0x02
    +
    +static inline int key_lookup_flags_check(u64 flags)
    +{
    + if (flags & ~(KEY_LOOKUP_CREATE | KEY_LOOKUP_PARTIAL))
    + return -EINVAL;
    +
    + return 0;
    +}
    +
    struct seq_file;
    struct user_struct;
    struct signal_struct;
    diff --git a/security/keys/internal.h b/security/keys/internal.h
    index 9b9cf3b6fcbb..3c1e7122076b 100644
    --- a/security/keys/internal.h
    +++ b/security/keys/internal.h
    @@ -165,8 +165,6 @@ extern struct key *request_key_and_link(struct key_type *type,

    extern bool lookup_user_key_possessed(const struct key *key,
    const struct key_match_data *match_data);
    -#define KEY_LOOKUP_CREATE 0x01
    -#define KEY_LOOKUP_PARTIAL 0x02

    extern long join_session_keyring(const char *name);
    extern void key_change_session_keyring(struct callback_head *twork);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-08-18 17:53    [W:4.271 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site