From: Alan Stern <stern@rowland.harvard.edu>
To: Evgeny Novikov <novikov@ispras.ru>
Cc: Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>,
Corentin Labbe <clabbe@baylibre.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
ldv-project@linuxtesting.org
Subject: Re: [PATCH] usb: gadget: net2280: fix memory leak on probe error handling paths
Date: Wed, 22 Jul 2020 10:17:41 -0400 [thread overview]
Message-ID: <20200722141741.GA1310843@rowland.harvard.edu> (raw)
In-Reply-To: <20200721201558.20069-1-novikov@ispras.ru>
On Tue, Jul 21, 2020 at 11:15:58PM +0300, Evgeny Novikov wrote:
> Driver does not release memory for device on error handling paths in
> net2280_probe() when gadget_release() is not registered yet.
>
> The patch fixes the bug like in other similar drivers.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
> ---
> drivers/usb/gadget/udc/net2280.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
> index 5eff85eeaa5a..d5fe071b2db2 100644
> --- a/drivers/usb/gadget/udc/net2280.c
> +++ b/drivers/usb/gadget/udc/net2280.c
> @@ -3781,8 +3781,10 @@ static int net2280_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> return 0;
>
> done:
> - if (dev)
> + if (dev) {
> net2280_remove(pdev);
> + kfree(dev);
> + }
> return retval;
> }
This patch seems to be the tip of an iceberg. Following through its
implications led to a couple of discoveries.
usb_del_gadget_udc() calls device_unregister(&gadget->dev). Once this
call returns, gadget has to be regarded as a stale pointer. But the
very next line of code does:
memset(&gadget->dev, 0x00, sizeof(gadget->dev));
for no apparent reason. I'm amazed this hasn't caused problems already.
Is there any justification for keeping this memset? It's hard to
imagine that it does any good.
Similarly, net2280_remove() calls usb_del_gadget_udc(&dev->gadget) at
its start, and so dev must be a stale pointer for the entire remainder
of the routine. But it gets used repeatedly. Surely we ought to have
a device_get() and device_put() in there.
Alan Stern
next prev parent reply other threads:[~2020-07-22 14:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 20:15 Evgeny Novikov
2020-07-22 14:17 ` Alan Stern [this message]
2020-07-22 19:56 ` Evgeny Novikov
2020-07-23 0:59 ` Benjamin Herrenschmidt
2020-07-23 1:02 ` Alan Stern
2020-07-23 1:00 ` Alan Stern
2020-07-23 8:50 ` Evgeny Novikov
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=20200722141741.GA1310843@rowland.harvard.edu \
--to=stern@rowland.harvard.edu \
--cc=arnd@arndb.de \
--cc=balbi@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=clabbe@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=ldv-project@linuxtesting.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=novikov@ispras.ru \
/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
all inboxes | Powered by JetHome®