mm/memunmap: don't access uninitialized memmap in memunmap_pages()

[linux-2.6-block.git] / fs / cifs / cifs_spnego.c

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index d1b439ad0f1a03035a4697417212ced696ef727b..7f01c6e607918d4e1356a9e7d305113777910089 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -32,25 +32,6 @@
 #include "cifsproto.h"
 static const struct cred *spnego_cred;
 
-static struct key_acl cifs_spnego_key_acl = {
-       .usage  = REFCOUNT_INIT(1),
-       .nr_ace = 2,
-       .possessor_viewable = true,
-       .aces = {
-               KEY_POSSESSOR_ACE(KEY_ACE_VIEW | KEY_ACE_SEARCH | KEY_ACE_READ),
-               KEY_OWNER_ACE(KEY_ACE_VIEW),
-       }
-};
-
-static struct key_acl cifs_spnego_keyring_acl = {
-       .usage  = REFCOUNT_INIT(1),
-       .nr_ace = 2,
-       .aces = {
-               KEY_POSSESSOR_ACE(KEY_ACE_SEARCH | KEY_ACE_WRITE),
-               KEY_OWNER_ACE(KEY_ACE_VIEW | KEY_ACE_READ | KEY_ACE_CLEAR),
-       }
-};
-
 /* create a new cifs key */
 static int
 cifs_spnego_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
@@ -189,8 +170,7 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
 
        cifs_dbg(FYI, "key description = %s\n", description);
        saved_cred = override_creds(spnego_cred);
-       spnego_key = request_key(&cifs_spnego_key_type, description, "",
-                                &cifs_spnego_key_acl);
+       spnego_key = request_key(&cifs_spnego_key_type, description, "");
        revert_creds(saved_cred);
 
 #ifdef CONFIG_CIFS_DEBUG2
@@ -227,7 +207,8 @@ init_cifs_spnego(void)
 
        keyring = keyring_alloc(".cifs_spnego",
                                GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
-                               &cifs_spnego_keyring_acl,
+                               (KEY_POS_ALL & ~KEY_POS_SETATTR) |
+                               KEY_USR_VIEW | KEY_USR_READ,
                                KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
        if (IS_ERR(keyring)) {
                ret = PTR_ERR(keyring);