Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-14 15:10:34 +0200
committerTakashi Iwai <tiwai@suse.de>2017-08-14 15:10:34 +0200
commit7bb74ad5ccb7ee06f5c1a3272ad701a9e67e75c7 (patch)
tree94ae01f149e89dc7fb6c9b25ecfcb37623917d8f
parent73afb6e9dc5a67ddda0df1bfee876d49444978ec (diff)
parentf6ee514a818a2901f2ce13a9fec44fc3deb9e73e (diff)
Merge branch 'SLE12-SP2' into SLE12-SP3
-rw-r--r--patches.drivers/iwlwifi-missing-error-code-in-iwl_trans_pcie_alloc33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.drivers/iwlwifi-missing-error-code-in-iwl_trans_pcie_alloc b/patches.drivers/iwlwifi-missing-error-code-in-iwl_trans_pcie_alloc
new file mode 100644
index 0000000000..c537f0d894
--- /dev/null
+++ b/patches.drivers/iwlwifi-missing-error-code-in-iwl_trans_pcie_alloc
@@ -0,0 +1,33 @@
+From 2388bd7b133504fa0991f483db66fad3a0de8694 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 14 Jun 2017 13:44:51 +0300
+Subject: [PATCH] iwlwifi: missing error code in iwl_trans_pcie_alloc()
+Git-commit: 2388bd7b133504fa0991f483db66fad3a0de8694
+Patch-mainline: 4.13-rc4
+References: bsc#1031717
+
+We don't set the error code here so we end up returning ERR_PTR(0) which
+is NULL. The caller doesn't expect that so it results in a NULL
+dereference.
+
+Fixes: 2e5d4a8f61dc ("iwlwifi: pcie: Add new configuration to enable MSIX")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
++++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
+@@ -2914,7 +2914,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
+ init_waitqueue_head(&trans_pcie->d0i3_waitq);
+
+ if (trans_pcie->msix_enabled) {
+- if (iwl_pcie_init_msix_handler(pdev, trans_pcie))
++ ret = iwl_pcie_init_msix_handler(pdev, trans_pcie);
++ if (ret)
+ goto out_pci_release_regions;
+ } else {
+ ret = iwl_pcie_alloc_ict(trans);
diff --git a/series.conf b/series.conf
index 0cb4370d60..fc182902de 100644
--- a/series.conf
+++ b/series.conf
@@ -11710,6 +11710,7 @@
patches.drivers/iwlwifi-mvm-reset-the-fw_dump_desc-pointer-after-ASS
patches.drivers/iwlwifi-mvm-unconditionally-stop-device-after-init
patches.drivers/iwlwifi-pcie-fix-command-completion-name-debug
+ patches.drivers/iwlwifi-missing-error-code-in-iwl_trans_pcie_alloc
patches.suse/iwlwifi-expose-default-fallback-ucode-api