Attachment 312459 Details for Bug 456320 – patch -- KEYS: fix lockdep warning when revoking auth key

[patch] patch -- KEYS: fix lockdep warning when revoking auth key

0001-BZ-456320-KEYS-fix-lockdep-warning-when-revoking-a.patch (text/plain), 1.17 KB, created by Jeff Layton on 2008-07-23 10:46:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-07-23 10:46:33 UTC

Size: 1.17 KB

patch

obsolete

>From 315bce6c26bbe50f5f66f8b062ced26086715955 Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Tue, 22 Jul 2008 21:50:32 -0400
>Subject: [PATCH] BZ#456320: KEYS: fix lockdep warning when revoking auth key
>
>When we revoke an authorization key for a key that we've just instantiated
>then we're usually holding the key sem for the newly instantiated key. This
>can confuse lockdep, so tell it that we might nest.
>---
> security/keys/key.c |    9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/security/keys/key.c b/security/keys/key.c
>index 7b98397..d2e3535 100644
>--- a/security/keys/key.c
>+++ b/security/keys/key.c
>@@ -901,9 +901,12 @@ void key_revoke(struct key *key)
> {
> 	key_check(key);
> 
>-	/* make sure no one's trying to change or use the key when we mark
>-	 * it */
>-	down_write(&key->sem);
>+	/* make sure no one's trying to change or use the key when we mark it
>+	 * - we tell lockdep that we might nest because we might be revoking an
>+	 *   authorisation key whilst holding the sem on a key we've just
>+	 *   instantiated
>+	 */
>+	down_write_nested(&key->sem, 1);
> 	set_bit(KEY_FLAG_REVOKED, &key->flags);
> 
> 	if (key->type->revoke)
>-- 
>1.5.5.1
>

Actions: View | Diff

Attachments on bug 456320: 312459