From: Emmanuel Grumbach <egrumbach@gmail.com>
To: Alexander Monakov <amonakov@gmail.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: iwlwifi null pointer dereference
Date: Wed, 30 Apr 2014 18:19:47 -0700 [thread overview]
Message-ID: <CANUX_P3=vC26x-EotmprmsnnpXwO+uDWUoVMohwsf2iO+zW8nQ@mail.gmail.com> (raw)
In-Reply-To: <535363D5.4070708@gmail.com>
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.
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!
next prev parent reply other threads:[~2014-05-01 1:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-12 15:11 iwlwifi null pointer dereference Alexander Monakov
2014-04-13 7:23 ` Emmanuel Grumbach
2014-04-13 8:49 ` Alexander Monakov
2014-04-17 20:56 ` Alexander Monakov
2014-04-18 5:08 ` Emmanuel Grumbach
2014-04-18 13:47 ` Emmanuel Grumbach
2014-04-18 14:34 ` Alexander Monakov
2014-04-18 14:50 ` Emmanuel Grumbach
2014-04-18 20:33 ` Alexander Monakov
2014-04-20 6:06 ` Emmanuel Grumbach
2014-05-01 1:19 ` Emmanuel Grumbach [this message]
2014-05-01 8:43 ` Alexander Monakov
2014-05-07 13:37 ` Emmanuel Grumbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANUX_P3=vC26x-EotmprmsnnpXwO+uDWUoVMohwsf2iO+zW8nQ@mail.gmail.com' \
--to=egrumbach@gmail.com \
--cc=amonakov@gmail.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).