Re: iwlwifi null pointer dereference

[Emmanuel Grumbach <egrumbach@xxxxxxxxx>]

Hi again,

On Sat, Apr 19, 2014 at 11:06 PM, Emmanuel Grumbach <egrumbach@xxxxxxxxx> wrote:
> Hi,
>
>

>>
>> It bisects to
>>
>> commit 2dbc368d7fded35ed221a3751405b15e06eb8925
>> Author: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
>> Date:   Mon Dec 9 11:09:47 2013 +0200
>>
>>     iwlwifi: pcie: track interrupt mask in SW
>>
>
> Yeah - ok.
> Thank you for this information.
> I'll check again later.

Can you try this? I guess it won't work, but I want to be sure about it.

diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c
b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 37f7acc..b3134f6 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1803,6 +1803,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct
pci_dev *pdev,
         * PCI Tx retries from interfering with C3 CPU state */
        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);

+       trans->dev = &pdev->dev;
+       trans_pcie->pci_dev = pdev;
+
        err = pci_enable_msi(pdev);
        if (err) {
                dev_err(&pdev->dev, "pci_enable_msi failed(0X%x)\n", err);
@@ -1814,8 +1817,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct
pci_dev *pdev,
                }
        }

-       trans->dev = &pdev->dev;
-       trans_pcie->pci_dev = pdev;
        trans->hw_rev = iwl_read32(trans, CSR_HW_REV);
        trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;
        snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html