From: Kees Cook <keescook@chromium.org>
To: David Howells <dhowells@redhat.com>,
James Morris <jamorris@linux.microsoft.com>
Cc: Sami Tolvanen <samitolvanen@google.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
KP Singh <kpsingh@google.com>,
Casey Schaufler <casey@schaufler-ca.com>,
Thomas Cedeno <thomascedeno@google.com>,
Anders Roxell <anders.roxell@linaro.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] security: fix the key_permission LSM hook function type
Date: Sat, 20 Jun 2020 22:54:58 -0700 [thread overview]
Message-ID: <202006202254.D6B60F2@keescook> (raw)
In-Reply-To: <20200615181232.119491-1-samitolvanen@google.com>
On Mon, Jun 15, 2020 at 11:12:32AM -0700, Sami Tolvanen wrote:
> Commit 8c0637e950d6 ("keys: Make the KEY_NEED_* perms an enum rather than
> a mask") changed the type of the key_permission callback functions, but
> didn't change the type of the hook, which trips indirect call checking with
> Control-Flow Integrity (CFI). This change fixes the issue by changing the
> hook type to match the functions.
>
> Fixes: 8c0637e950d6 ("keys: Make the KEY_NEED_* perms an enum rather than a mask")
> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
> ---
> include/linux/lsm_hook_defs.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
> index 6791813cd439..24f6683f1cfc 100644
> --- a/include/linux/lsm_hook_defs.h
> +++ b/include/linux/lsm_hook_defs.h
> @@ -360,7 +360,7 @@ LSM_HOOK(int, 0, key_alloc, struct key *key, const struct cred *cred,
> unsigned long flags)
> LSM_HOOK(void, LSM_RET_VOID, key_free, struct key *key)
> LSM_HOOK(int, 0, key_permission, key_ref_t key_ref, const struct cred *cred,
> - unsigned perm)
> + enum key_need_perm need_perm)
> LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **_buffer)
> #endif /* CONFIG_KEYS */
>
>
> base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407
David, James? Can someone please take this?
--
Kees Cook
next prev parent reply other threads:[~2020-06-21 5:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 18:12 [PATCH] security: fix the key_permission LSM hook function type Sami Tolvanen
2020-06-15 18:21 ` Kees Cook
2020-06-15 18:23 ` Nick Desaulniers
2020-06-15 18:47 ` Kees Cook
2020-06-21 5:54 ` Kees Cook [this message]
2020-06-22 17:38 ` James Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202006202254.D6B60F2@keescook \
--to=keescook@chromium.org \
--cc=anders.roxell@linaro.org \
--cc=casey@schaufler-ca.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jamorris@linux.microsoft.com \
--cc=kpsingh@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=thomascedeno@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.