netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Allen <allen.pais@oracle.com>
To: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/net/fjes: fix a potential NULL pointer dereference
Date: Mon, 23 Sep 2019 21:34:50 +0530	[thread overview]
Message-ID: <12b96a9f-27c7-86b4-af90-cad594240bf8@oracle.com> (raw)
In-Reply-To: <20190921184009.32edfa43@cakuba.netronome.com>


> 
> If I'm looking at this right you are jumping to err_free_netdev without
> setting the err variable. It must had been set to 0 from the return of
> fjes_sw_init(). This means we will free the netdev, and return 0. This
> means probe will not fail and driver's remove function will be run
> at some point. fjes_remove it will try to free the netdev again.

  Good catch. Here's a quick diff what I should have done,

--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -1236,9 +1236,21 @@ static int fjes_probe(struct platform_device 
*plat_dev)
         adapter->force_reset = false;
         adapter->open_guard = false;

+       /* Re-initialize err to -ENOMEM to handle workqueue allocation 
failures,
+          and we don't return 0 on failure.
+       */
+       err = -ENOMEM;
+
         adapter->txrx_wq = alloc_workqueue(DRV_NAME "/txrx", 
WQ_MEM_RECLAIM, 0);
+       if (unlikely(!adapter->txrx_wq))
+               goto err_free_netdev;
+
         adapter->control_wq = alloc_workqueue(DRV_NAME "/control",
                                               WQ_MEM_RECLAIM, 0);
+       if (unlikely(!adapter->control_wq)) {
+               destroy_workqueue(adapter->txrx_wq);
+               goto err_free_netdev;
+       }


> Looks like there's another existing bug here in that the work queues
> are not free when something fails in fjes_probe, just the netdev.

I shall look into it and send out a separate fix.

> Once you untangle that, and before you post a v2, could you please try
> to identify which commit introduced the regression and provide an
> appropriate "Fixes" tag?
> 

Fixes: f2edc4e1b078("net: fjes: fjes_main: Remove create_workqueue")

- Allen

      reply	other threads:[~2019-09-23 16:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-18 16:33 [PATCH] drivers/net/fjes: fix a potential NULL pointer dereference Allen Pais
2019-09-22  1:40 ` Jakub Kicinski
2019-09-23 16:04   ` Allen [this message]

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=12b96a9f-27c7-86b4-af90-cad594240bf8@oracle.com \
    --to=allen.pais@oracle.com \
    --cc=davem@davemloft.net \
    --cc=jakub.kicinski@netronome.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@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).