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>
Subject: [PATCH 7/7] USB: cdc-acm: always claim data interface
Date: Thu, 18 Mar 2021 16:52:02 +0100 [thread overview]
Message-ID: <20210318155202.22230-8-johan@kernel.org> (raw)
In-Reply-To: <20210318155202.22230-1-johan@kernel.org>
Make sure to always claim the data interface and bail out if it's
already bound to another driver or isn't authorised.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/class/cdc-acm.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 6991ffd66c5d..58c444f9db5e 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1486,7 +1486,11 @@ static int acm_probe(struct usb_interface *intf,
acm->line.bDataBits = 8;
acm_set_line(acm, &acm->line);
- usb_driver_claim_interface(&acm_driver, data_interface, acm);
+ if (!acm->combined_interfaces) {
+ rv = usb_driver_claim_interface(&acm_driver, data_interface, acm);
+ if (rv)
+ goto err_remove_files;
+ }
tty_dev = tty_port_register_device(&acm->port, acm_tty_driver, minor,
&control_interface->dev);
@@ -1508,6 +1512,7 @@ static int acm_probe(struct usb_interface *intf,
usb_set_intfdata(data_interface, NULL);
usb_driver_release_interface(&acm_driver, data_interface);
}
+err_remove_files:
if (acm->country_codes) {
device_remove_file(&acm->control->dev,
&dev_attr_wCountryCodes);
--
2.26.2
next prev parent reply other threads:[~2021-03-18 15:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 15:51 [PATCH 0/7] USB: cdc-acm: probe fixes Johan Hovold
2021-03-18 15:51 ` [PATCH 1/7] USB: cdc-acm: fix double free on probe failure Johan Hovold
2021-03-22 9:38 ` Oliver Neukum
2021-03-18 15:51 ` [PATCH 2/7] USB: cdc-acm: fix use-after-free after " Johan Hovold
2021-03-22 9:39 ` Oliver Neukum
2021-03-18 15:51 ` [PATCH 3/7] USB: cdc-acm: drop redundant driver-data assignment Johan Hovold
2021-03-22 9:39 ` Oliver Neukum
2021-03-18 15:51 ` [PATCH 4/7] USB: cdc-acm: drop redundant driver-data reset Johan Hovold
2021-03-22 9:40 ` Oliver Neukum
2021-03-18 15:52 ` [PATCH 5/7] USB: cdc-acm: clean up probe error labels Johan Hovold
2021-03-22 9:41 ` Oliver Neukum
2021-03-18 15:52 ` [PATCH 6/7] USB: cdc-acm: use negation for NULL checks Johan Hovold
2021-03-22 9:41 ` Oliver Neukum
2021-03-18 15:52 ` Johan Hovold [this message]
2021-03-22 10:46 ` [PATCH 7/7] USB: cdc-acm: always claim data interface Oliver Neukum
2021-03-22 14:13 ` 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=20210318155202.22230-8-johan@kernel.org \
--to=johan@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oneukum@suse.com \
/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).