diff options
| author |   Ondrej Mosnacek <omosnace@redhat.com> | 2022-02-21 15:06:49 +0100 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2022-02-22 18:02:58 -0500 |
| commit | ce2fc710c9d2b25afc710f49bb2065b4439a62bc (patch) | |
| tree | c6149fbab72c150eb0499535bdfaef55e871c7e5 /security/selinux | |
| parent | selinux: fix double free of cond_list on error paths (diff) | |
| download | linux-dev-ce2fc710c9d2b25afc710f49bb2065b4439a62bc.tar.xz linux-dev-ce2fc710c9d2b25afc710f49bb2065b4439a62bc.zip | |
selinux: fix misuse of mutex_is_locked()
mutex_is_locked() tests whether the mutex is locked *by any task*, while
here we want to test if it is held *by the current task*. To avoid
false/missed WARNINGs, use lockdep_assert_is_held() and
lockdep_assert_is_not_held() instead, which do the right thing (though
they are a no-op if CONFIG_LOCKDEP=n).
Cc: stable@vger.kernel.org
Fixes: 2554a48f4437 ("selinux: measure state and policy capabilities")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/ima.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ima.c b/security/selinux/ima.c index 727c4e43219d..ff7aea6b3774 100644 --- a/security/selinux/ima.c +++ b/security/selinux/ima.c @@ -77,7 +77,7 @@ void selinux_ima_measure_state_locked(struct selinux_state *state) size_t policy_len; int rc = 0; - WARN_ON(!mutex_is_locked(&state->policy_mutex)); + lockdep_assert_held(&state->policy_mutex); state_str = selinux_ima_collect_state(state); if (!state_str) { @@ -117,7 +117,7 @@ void selinux_ima_measure_state_locked(struct selinux_state *state) */ void selinux_ima_measure_state(struct selinux_state *state) { - WARN_ON(mutex_is_locked(&state->policy_mutex)); + lockdep_assert_not_held(&state->policy_mutex); mutex_lock(&state->policy_mutex); selinux_ima_measure_state_locked(state); |