cifs: explicitly revoke SPNEGO key after session setup
authorJeff Layton <jlayton@redhat.com>
Wed, 24 Sep 2008 15:32:59 +0000 (11:32 -0400)
committerSteve French <sfrench@us.ibm.com>
Wed, 24 Sep 2008 20:59:37 +0000 (20:59 +0000)
cifs: explicitly revoke SPNEGO key after session setup

The SPNEGO blob returned by an upcall can only be used once. Explicitly
revoke it to make sure that we never pick it up again after session
setup exits.

This doesn't seem to be that big an issue on more recent kernels, but
older kernels seem to link keys into the session keyring by default.
That said, explicitly revoking the key seems like a reasonable thing
to do here.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/sess.c

index 252fdc0567f1aa186f36f8c68d83f259d6db4ee0..2851d5da0c8c03f34143fb7b24542d3da239a2f8 100644 (file)
@@ -624,8 +624,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time,
                                         ses, nls_cp);
 
 ssetup_exit:
-       if (spnego_key)
+       if (spnego_key) {
+               key_revoke(spnego_key);
                key_put(spnego_key);
+       }
        kfree(str_area);
        if (resp_buf_type == CIFS_SMALL_BUFFER) {
                cFYI(1, ("ssetup freeing small buf %p", iov[0].iov_base));