Update from upstream with manual merge of Yasunori Goto's

changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index f22264632229..a8e4069d48cb 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -7,6 +7,8 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
+ *
+ * See Documentation/keys-request-key.txt
  */
 
 #include <linux/module.h>
@@ -96,6 +98,7 @@ static void request_key_auth_destroy(struct key *key)
         kenter("{%d}", key->serial);
 
         key_put(rka->target_key);
+        kfree(rka);
 
 } /* end request_key_auth_destroy() */
 
@@ -126,7 +129,7 @@ struct key *request_key_auth_new(struct key *target, struct key **_rkakey)
 
         rkakey = key_alloc(&key_type_request_key_auth, desc,
                            current->fsuid, current->fsgid,
-                           KEY_USR_VIEW, 1);
+                           KEY_POS_VIEW | KEY_USR_VIEW, 1);
         if (IS_ERR(rkakey)) {
                 key_put(keyring);
                 kleave("= %ld", PTR_ERR(rkakey));