| Message ID | 000201d01c61$bdb956b0$392c0410$@163.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 12/20/2014 5:32 PM, Jia-Ju Bai wrote: > I am inexperienced in submitting patches, sorry. I see. It looks like you're failing to understand my English, too. :-( Please put such remarks under the --- line which should be placed after sign-off area. > I have revised my patch: You still need to revise it some more. > 1.Check whether pci_pool_create is failed in e100_probe to avoid null > dereference in pci_pool_alloc(in e100_alloc_cbs). Please fix this issue by one (first) patch. > 2.Add netif_napi_del to match the call of netif_napi_add. And fix this one by another (second) patch. Also, you need to insert empty line before sign-off. > Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com> ... and after sign-off too. > diff --git a/drivers/net/ethernet/intel/e100.c > b/drivers/net/ethernet/intel/e100.c > index 781065e..a58ab2e 100644 [...] And finally, please re-post the patches in a new thread, not in reply to this (or other) thread. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Your patch submissions are not usable by us. Instead of immediately sending your patch 10 seconds after you receive feedback, take your time and make sure you do everything calmly and cleanly and as tidy as possible. There is absolutely no rush with these changes. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Th driver lacks netif_napi_del in the normal path and error path to match the call of netif_napi_add in e1000_probe.
This patch fixes this problem, and it has been tested in runtime.
Signed-off-by: Jia-Ju Bai<baijiaju1990@163.com>
---
drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +-
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 24f3986..f6def7b 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -1004,7 +1004,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* make ready for any if (hw->...) below */
err = e1000_init_hw_struct(adapter, hw);
if (err)
- goto err_sw_init;
+ goto err_dma;
/* there is a workaround being applied below that limits
* 64-bit DMA addresses to 64-bit hardware. There are some
@@ -1239,8 +1239,9 @@ err_eeprom:
iounmap(hw->flash_address);
kfree(adapter->tx_ring);
kfree(adapter->rx_ring);
-err_dma:
err_sw_init:
+ netif_napi_del(&adapter->napi);
+err_dma:
err_mdio_ioremap:
iounmap(hw->ce4100_gbe_mdio_base_virt);
iounmap(hw->hw_addr);
@@ -1271,6 +1272,7 @@ static void e1000_remove(struct pci_dev *pdev)
e1000_down_and_stop(adapter);
e1000_release_manageability(adapter);
+ netif_napi_del(&adapter->napi);
unregister_netdev(netdev);
e1000_phy_hw_reset(hw);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 12/21/2014 3:52 AM, Jia-Ju Bai wrote: > Th driver lacks netif_napi_del in the normal path and error path to match the > call of netif_napi_add in e1000_probe. Please wrap your change log lines at 80 columns (or less). > This patch fixes this problem, and it has been tested in runtime. > Signed-off-by: Jia-Ju Bai<baijiaju1990@163.com> > --- > drivers/net/ethernet/intel/e1000/e1000_main.c | 6 +- > 1 file changed, 4 insertions(+), 2 deletions(-) > diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c > b/drivers/net/ethernet/intel/e1000/e1000_main.c > > index 24f3986..f6def7b 100644 > > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c > > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c > > @@ -1004,7 +1004,7 @@ static int e1000_probe(struct pci_dev *pdev, const > struct pci_device_id *ent) > > /* make ready for any if (hw->...) below */ > > err = e1000_init_hw_struct(adapter, hw); > > if (err) > > - goto err_sw_init; > > + goto err_dma; > > /* there is a workaround being applied below that limits > > * 64-bit DMA addresses to 64-bit hardware. There are some Somehow your mailer inserted empty lines after each actual line of the patch. :-( WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/21/2014 4:19 AM, Jia-Ju Bai wrote:
Please don't send HTML to this mailing list -- your mail may be ignored by
the list server.
> The driver lacks the check of nic->cbs_pool after pci_pool_create in e100_probe. So when this function is failed, the null pointer dereference occurs when pci_pool_alloc uses nic->cbs_pool in e100_alloc_cbs.
Same comment as for the previous patch about wrapping at 80 columns.
> This patch fix this problem, and it has been tested in runtime.
> Signed-off-by: Jia-Ju Bai<baijiaju1990@163.com>
> ---
> drivers/net/ethernet/intel/e100.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
> index 781065e..ba1813f 100644
> --- a/drivers/net/ethernet/intel/e100.c
> +++ b/drivers/net/ethernet/intel/e100.c
> @@ -2969,6 +2969,10 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> nic->params.cbs.max * sizeof(struct cb),
> sizeof(u32),
> 0);
> + if (!nic->cbs_pool) {
> + err = -ENOMEM;
> + goto err_out_pool;
> + }
Looks like tabs got converted to spaces by your mailer, thus the patch
can't be applied. Consider using 'git send-email' instead.
[...]
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 781065e..a58ab2e 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2969,6 +2969,10 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) nic->params.cbs.max * sizeof(struct cb), sizeof(u32), 0); + if (!nic->cbs_pool) { + err = -ENOMEM; + goto err_out_pool; + } netif_info(nic, probe, nic->netdev, "addr 0x%llx, irq %d, MAC addr %pM\n",