From: Johan Hovold <johan@kernel.org>
To: Oliver Neukum <oneukum@suse.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>,
stable@vger.kernel.org, Jaejoong Kim <climbbb.kim@gmail.com>
Subject: [PATCH v2 1/8] USB: cdc-acm: fix double free on probe failure
Date: Mon, 22 Mar 2021 16:53:11 +0100 [thread overview]
Message-ID: <20210322155318.9837-2-johan@kernel.org> (raw)
In-Reply-To: <20210322155318.9837-1-johan@kernel.org>
If tty-device registration fails the driver copy of any Country
Selection functional descriptor would end up being freed twice; first
explicitly in the error path and then again in the tty-port destructor.
Drop the first erroneous free that was left when fixing a tty-port
resource leak.
Fixes: cae2bc768d17 ("usb: cdc-acm: Decrement tty port's refcount if probe() fail")
Cc: stable@vger.kernel.org # 4.19
Cc: Jaejoong Kim <climbbb.kim@gmail.com>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/class/cdc-acm.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 39ddb5585ded..d75a78ad464d 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1508,7 +1508,6 @@ static int acm_probe(struct usb_interface *intf,
&dev_attr_wCountryCodes);
device_remove_file(&acm->control->dev,
&dev_attr_iCountryCodeRelDate);
- kfree(acm->country_codes);
}
device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
alloc_fail5:
--
2.26.3
next prev parent reply other threads:[~2021-03-22 15:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 15:53 [PATCH v2 0/8] USB: cdc-acm: probe fixes Johan Hovold
2021-03-22 15:53 ` Johan Hovold [this message]
2021-03-22 15:53 ` [PATCH v2 2/8] USB: cdc-acm: fix use-after-free after probe failure Johan Hovold
2021-03-22 15:53 ` [PATCH v2 3/8] USB: cdc-acm: drop redundant driver-data assignment Johan Hovold
2021-03-22 15:53 ` [PATCH v2 4/8] USB: cdc-acm: drop redundant driver-data reset Johan Hovold
2021-03-22 15:53 ` [PATCH v2 5/8] USB: cdc-acm: clean up probe error labels Johan Hovold
2021-03-22 15:53 ` [PATCH v2 6/8] USB: cdc-acm: use negation for NULL checks Johan Hovold
2021-03-22 15:53 ` [PATCH v2 7/8] USB: cdc-acm: always claim data interface Johan Hovold
2021-03-22 15:53 ` [PATCH v2 8/8] USB: cdc-acm: do not log successful probe on later errors Johan Hovold
2021-03-23 12:27 ` [PATCH v2 0/8] USB: cdc-acm: probe fixes Greg Kroah-Hartman
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=20210322155318.9837-2-johan@kernel.org \
--to=johan@kernel.org \
--cc=climbbb.kim@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oneukum@suse.com \
--cc=stable@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).