diff options
| author | Lance Roy <ldr709@gmail.com> | 2018-10-03 07:39:01 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-10-03 15:29:22 +0200 |
| commit | 0fb871cc42537465e322f727bec6abfd375faa83 (patch) | |
| tree | b3d3bab8c5d544e7deae540a70685b49b9545ff0 /security/apparmor/file.c | |
| parent | apparmor: Allow filtering based on secmark policy (diff) | |
| download | linux-0fb871cc42537465e322f727bec6abfd375faa83.tar.xz linux-0fb871cc42537465e322f727bec6abfd375faa83.zip | |
apparmor: Replace spin_is_locked() with lockdep
lockdep_assert_held() is better suited to checking locking requirements,
since it won't get confused when someone else holds the lock. This is
also a step towards possibly removing spin_is_locked().
Signed-off-by: Lance Roy <ldr709@gmail.com>
Cc: John Johansen <john.johansen@canonical.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: <linux-security-module@vger.kernel.org>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/file.c')
| -rw-r--r-- | security/apparmor/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/file.c b/security/apparmor/file.c index 4285943f7260..d0afed9ebd0e 100644 --- a/security/apparmor/file.c +++ b/security/apparmor/file.c @@ -496,7 +496,7 @@ static void update_file_ctx(struct aa_file_ctx *fctx, struct aa_label *label, /* update caching of label on file_ctx */ spin_lock(&fctx->lock); old = rcu_dereference_protected(fctx->label, - spin_is_locked(&fctx->lock)); + lockdep_is_held(&fctx->lock)); l = aa_label_merge(old, label, GFP_ATOMIC); if (l) { if (l != old) { |