diff mbox

iwlwifi null pointer dereference

Message ID CANUX_P3=vC26x-EotmprmsnnpXwO+uDWUoVMohwsf2iO+zW8nQ@mail.gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Emmanuel Grumbach May 1, 2014, 1:19 a.m. UTC 
Hi again,

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

>>
>> It bisects to
>>
>> commit 2dbc368d7fded35ed221a3751405b15e06eb8925
>> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>> 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.

                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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Alexander Monakov May 1, 2014, 8:43 a.m. UTC | #1 
On Thu, May 1, 2014 at 5:19 AM, Emmanuel Grumbach <egrumbach@gmail.com> wrote:
>>> It bisects to
>>>
>>> commit 2dbc368d7fded35ed221a3751405b15e06eb8925
>>> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>>> 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.

Indeed, it still fails for me with that patch on top of 3.14.0.

Anything else I can do?
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Emmanuel Grumbach May 7, 2014, 1:37 p.m. UTC | #2 
On Thu, May 1, 2014 at 11:43 AM, Alexander Monakov <amonakov@gmail.com> wrote:
> On Thu, May 1, 2014 at 5:19 AM, Emmanuel Grumbach <egrumbach@gmail.com> wrote:
>>>> It bisects to
>>>>
>>>> commit 2dbc368d7fded35ed221a3751405b15e06eb8925
>>>> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>>>> 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.
>
> Indeed, it still fails for me with that patch on top of 3.14.0.
>
> Anything else I can do?

Ok - I now understand what happened. Fix is on the way.
Sorry for having been so long. Vacation plus travelling doesn't help.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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) {