From 4885c8af2acbfa30b204c238d368fddbd75558ff Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Jul 2017 18:40:28 +0200 Subject: [PATCH] 4.9-stable patches added patches: ath10k-override-ce5-config-for-qca9377.patch crypto-drbg-fixes-panic-in-wait_for_completion-call.patch keys-fix-an-error-code-in-request_master_key.patch --- ...h10k-override-ce5-config-for-qca9377.patch | 36 ++++++++++++++++++ ...es-panic-in-wait_for_completion-call.patch | 31 ++++++++++++++++ ...-an-error-code-in-request_master_key.patch | 37 +++++++++++++++++++ queue-4.9/series | 3 ++ 4 files changed, 107 insertions(+) create mode 100644 queue-4.9/ath10k-override-ce5-config-for-qca9377.patch create mode 100644 queue-4.9/crypto-drbg-fixes-panic-in-wait_for_completion-call.patch create mode 100644 queue-4.9/keys-fix-an-error-code-in-request_master_key.patch diff --git a/queue-4.9/ath10k-override-ce5-config-for-qca9377.patch b/queue-4.9/ath10k-override-ce5-config-for-qca9377.patch new file mode 100644 index 00000000000..ef465007819 --- /dev/null +++ b/queue-4.9/ath10k-override-ce5-config-for-qca9377.patch @@ -0,0 +1,36 @@ +From b08b5b53a1ed2bd7a883f8fd29232c8f03604671 Mon Sep 17 00:00:00 2001 +From: Bartosz Markowski +Date: Thu, 15 Dec 2016 11:23:22 +0200 +Subject: ath10k: override CE5 config for QCA9377 + +From: Bartosz Markowski + +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 +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -3133,7 +3133,7 @@ int ath10k_pci_setup_resource(struct ath + setup_timer(&ar_pci->rx_post_retry, ath10k_pci_rx_replenish_retry, + (unsigned long)ar); + +- 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.9/crypto-drbg-fixes-panic-in-wait_for_completion-call.patch b/queue-4.9/crypto-drbg-fixes-panic-in-wait_for_completion-call.patch new file mode 100644 index 00000000000..c299d861056 --- /dev/null +++ b/queue-4.9/crypto-drbg-fixes-panic-in-wait_for_completion-call.patch @@ -0,0 +1,31 @@ +From b61929c654f2e725644935737c4c1ea9c741e2f8 Mon Sep 17 00:00:00 2001 +From: Stephan Mueller +Date: Fri, 26 May 2017 12:11:31 +0200 +Subject: crypto: drbg - Fixes panic in wait_for_completion call + +From: Stephan Mueller + +commit b61929c654f2e725644935737c4c1ea9c741e2f8 upstream. + +Initialise ctr_completion variable before use. + +Cc: +Signed-off-by: Harsh Jain +Signed-off-by: Stephan Mueller +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/drbg.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/crypto/drbg.c ++++ b/crypto/drbg.c +@@ -1691,6 +1691,7 @@ static int drbg_init_sym_kernel(struct d + return PTR_ERR(sk_tfm); + } + drbg->ctr_handle = sk_tfm; ++ init_completion(&drbg->ctr_completion); + + req = skcipher_request_alloc(sk_tfm, GFP_KERNEL); + if (!req) { diff --git a/queue-4.9/keys-fix-an-error-code-in-request_master_key.patch b/queue-4.9/keys-fix-an-error-code-in-request_master_key.patch new file mode 100644 index 00000000000..e67a85ae797 --- /dev/null +++ b/queue-4.9/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 +Date: Thu, 9 Feb 2017 17:17:52 +0000 +Subject: KEYS: Fix an error code in request_master_key() + +From: Dan Carpenter + +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 +Acked-by: Mimi Zohar +Signed-off-by: James Morris +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -437,7 +437,7 @@ static struct skcipher_request *init_skc + 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.9/series b/queue-4.9/series index f77de98ffe6..41b0b5566a2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -34,3 +34,6 @@ gfs2-fix-glock-rhashtable-rcu-bug.patch tpm-fix-a-kernel-memory-leak-in-tpm-sysfs.c.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 +crypto-drbg-fixes-panic-in-wait_for_completion-call.patch -- 2.47.3