3.18-stable patches

added patches:
	keys-fix-an-error-code-in-request_master_key.patch

diff --git a/queue-3.18/keys-fix-an-error-code-in-request_master_key.patch b/queue-3.18/keys-fix-an-error-code-in-request_master_key.patch
new file mode 100644 (file)
index 0000000..8957872
--- /dev/null
+++ b/queue-3.18/keys-fix-an-error-code-in-request_master_key.patch
@@ -0,0 +1,37 @@
+From 57cb17e764ba0aaa169d07796acce54ccfbc6cae Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Thu, 9 Feb 2017 17:17:52 +0000
+Subject: KEYS: Fix an error code in request_master_key()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 57cb17e764ba0aaa169d07796acce54ccfbc6cae upstream.
+
+This function has two callers and neither are able to handle a NULL
+return.  Really, -EINVAL is the correct thing return here anyway.  This
+fixes some static checker warnings like:
+
+       security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt()
+       error: uninitialized symbol 'master_key'.
+
+Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
+Signed-off-by: James Morris <james.l.morris@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ security/keys/encrypted-keys/encrypted.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/security/keys/encrypted-keys/encrypted.c
++++ b/security/keys/encrypted-keys/encrypted.c
+@@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct bl
+ static struct key *request_master_key(struct encrypted_key_payload *epayload,
+                                     u8 **master_key, size_t *master_keylen)
+ {
+-      struct key *mkey = NULL;
++      struct key *mkey = ERR_PTR(-EINVAL);
+ 
+       if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,
+                    KEY_TRUSTED_PREFIX_LEN)) {

diff --git a/queue-3.18/series b/queue-3.18/series
index baabc6e419f1859d2c09ff8376a08c456050b2b7..454e66482132d82241330f58e970153a8888f124 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -14,3 +14,4 @@ pinctrl-mxs-atomically-switch-mux-and-drive-strength-config.patch
 pinctrl-sh-pfc-update-info-pointer-after-soc-specific-init.patch
 usb-serial-option-add-two-longcheer-device-ids.patch
 usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
+keys-fix-an-error-code-in-request_master_key.patch