From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 23 Jul 2012 17:14:28 +0000 (-0400)
Subject: cifs: after upcalling for krb5 creds, invalidate key rather than revoking it
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=00401ff780c58b9dabffef668386c206efc71c7c;p=deliverable%2Flinux.git

cifs: after upcalling for krb5 creds, invalidate key rather than revoking it

Calling key_revoke here isn't ideal as further requests for the key will
end up returning -EKEYREVOKED until it gets purged from the cache. What we
really intend here is to force a new upcall on the next request_key.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
---

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index 551d0c2b9736..b4219789049a 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -938,7 +938,7 @@ ssetup_ntlmssp_authenticate:
 
 ssetup_exit:
 	if (spnego_key) {
-		key_revoke(spnego_key);
+		key_invalidate(spnego_key);
 		key_put(spnego_key);
 	}
 	kfree(str_area);