From: Tiezhu Yang <yangtiezhu@loongson.cn>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Xuefeng Li <lixuefeng@loongson.cn>
Subject: Re: [PATCH 2/2] USB: core: Fix potential memory leak in usb_get_configuration()
Date: Wed, 26 Feb 2020 16:42:55 +0800 [thread overview]
Message-ID: <c7dfaa07-dd34-600d-2a69-95a65f966dfc@loongson.cn> (raw)
In-Reply-To: <20200226080906.GV32540@localhost>
On 02/26/2020 04:09 PM, Johan Hovold wrote:
> On Wed, Feb 26, 2020 at 02:15:23PM +0800, Tiezhu Yang wrote:
>> Make sure to free all the allocated memory before exiting from the function
>> usb_get_configuration() when an error is encountered.
> There's no leak in this function as far as I can tell. Any allocated
> memory is released in usb_destroy_configuration() when the last
> reference to the struct usb_device is dropped.
Yes, you are right, the allocated memory in usb_get_configuration()
will be released in usb_destroy_configuration().
By the way, is it better to release the allocated memory as early as
possible
in usb_get_configuration()? Just like this:
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index bb63ee0..dd4ebeb 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -885,12 +885,17 @@ int usb_get_configuration(struct usb_device *dev)
length = ncfg * sizeof(char *);
dev->rawdescriptors = kzalloc(length, GFP_KERNEL);
- if (!dev->rawdescriptors)
+ if (!dev->rawdescriptors) {
+ kfree(dev->config);
return -ENOMEM;
+ }
desc = kmalloc(USB_DT_CONFIG_SIZE, GFP_KERNEL);
- if (!desc)
+ if (!desc) {
+ kfree(dev->config);
+ kfree(dev->rawdescriptors);
return -ENOMEM;
+ }
for (cfgno = 0; cfgno < ncfg; cfgno++) {
/* We grab just the first descriptor so we know how long
Thanks,
Tiezhu Yang
>
>> Additionally, just initialize the variable "bigbuffer" with NULL to avoid
>> the following build warning:
>>
>> CC drivers/usb/core/config.o
>> drivers/usb/core/config.c: In function ‘usb_get_configuration’:
>> drivers/usb/core/config.c:956:2: warning: ‘bigbuffer’ may be used uninitialized in this function [-Wmaybe-uninitialized]
>> kfree(bigbuffer);
>> ^
> No need to mention warnings that you introduce yourself while creating
> your patch. It can give the false impression that your addressing an
> existing issue.
>
> Johan
next prev parent reply other threads:[~2020-02-26 8:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 6:15 [PATCH 1/2] USB: core: Fix build warning " Tiezhu Yang
2020-02-26 6:15 ` [PATCH 2/2] USB: core: Fix potential memory leak " Tiezhu Yang
2020-02-26 8:09 ` Johan Hovold
2020-02-26 8:42 ` Tiezhu Yang [this message]
2020-02-26 10:12 ` Johan Hovold
2020-02-26 8:04 ` [PATCH 1/2] USB: core: Fix build warning " Johan Hovold
2020-02-26 8:35 ` Tiezhu Yang
2020-02-26 10:09 ` Johan Hovold
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=c7dfaa07-dd34-600d-2a69-95a65f966dfc@loongson.cn \
--to=yangtiezhu@loongson.cn \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
/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®