4.4-stable patches

added patches:
	ath10k-override-ce5-config-for-qca9377.patch
	keys-fix-an-error-code-in-request_master_key.patch

diff --git a/queue-4.4/ath10k-override-ce5-config-for-qca9377.patch b/queue-4.4/ath10k-override-ce5-config-for-qca9377.patch
new file mode 100644 (file)
index 0000000..a1060cb
--- /dev/null
+++ b/queue-4.4/ath10k-override-ce5-config-for-qca9377.patch
@@ -0,0 +1,36 @@
+From b08b5b53a1ed2bd7a883f8fd29232c8f03604671 Mon Sep 17 00:00:00 2001
+From: Bartosz Markowski <bartosz.markowski@tieto.com>
+Date: Thu, 15 Dec 2016 11:23:22 +0200
+Subject: ath10k: override CE5 config for QCA9377
+
+From: Bartosz Markowski <bartosz.markowski@tieto.com>
+
+commit b08b5b53a1ed2bd7a883f8fd29232c8f03604671 upstream.
+
+Similarly to QCA6174, QCA9377 requires the CE5 configuration to be
+available for other feature. Use the ath10k_pci_override_ce_config()
+for it as well.
+
+This is required for TF2.0 firmware. Previous FW revisions were
+working fine without this patch.
+
+Fixes: a70587b3389a ("ath10k: configure copy engine 5 for HTT messages")
+Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com>
+Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/ath/ath10k/pci.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/ath10k/pci.c
++++ b/drivers/net/wireless/ath/ath10k/pci.c
+@@ -3050,7 +3050,7 @@ static int ath10k_pci_probe(struct pci_d
+               goto err_core_destroy;
+       }
+ 
+-      if (QCA_REV_6174(ar))
++      if (QCA_REV_6174(ar) || QCA_REV_9377(ar))
+               ath10k_pci_override_ce_config(ar);
+ 
+       ret = ath10k_pci_alloc_pipes(ar);

diff --git a/queue-4.4/keys-fix-an-error-code-in-request_master_key.patch b/queue-4.4/keys-fix-an-error-code-in-request_master_key.patch
new file mode 100644 (file)
index 0000000..4f49dce
--- /dev/null
+++ b/queue-4.4/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,
+                                     const 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-4.4/series b/queue-4.4/series
index ee46c16471f1e943f7a605dc65ade7d13823abd5..2c49b9fd9295100222b19f26a58729538c4266dd 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -24,3 +24,5 @@ usb-serial-qcserial-new-sierra-wireless-em7305-device-id.patch
 gfs2-fix-glock-rhashtable-rcu-bug.patch
 x86-tools-fix-gcc-7-warning-in-relocs.c.patch
 x86-uaccess-optimize-copy_user_enhanced_fast_string-for-short-strings.patch
+ath10k-override-ce5-config-for-qca9377.patch
+keys-fix-an-error-code-in-request_master_key.patch