From: Johan Hovold <johan@kernel.org>
To: Anant Thazhemadam <anant.thazhemadam@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Evgeny Novikov <novikov@ispras.ru>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 09/12] usb: misc: lvstest: update to use the usb_control_msg_{send|recv}() API
Date: Wed, 27 Jan 2021 16:15:03 +0100 [thread overview]
Message-ID: <YBGDdyfVNKOvZPJr@hovoldconsulting.com> (raw)
In-Reply-To: <20210126183943.914631-1-anant.thazhemadam@gmail.com>
On Wed, Jan 27, 2021 at 12:09:43AM +0530, Anant Thazhemadam wrote:
> The newer usb_control_msg_{send|recv}() API are an improvement on the
> existing usb_control_msg() as it ensures that a short read/write is treated
> as an error, data can be used off the stack, and raw usb pipes need not be
> created in the calling functions.
> For this reason, instances of usb_control_msg() have been replaced with
> usb_control_msg_{recv|send}() and the return value checking conditions have
> also been modified appropriately.
>
> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
> ---
> drivers/usb/misc/lvstest.c | 38 ++++++++++++++++----------------------
> 1 file changed, 16 insertions(+), 22 deletions(-)
> @@ -336,10 +330,10 @@ static void lvs_rh_work(struct work_struct *work)
>
> /* Examine each root port */
> for (i = 1; i <= descriptor->bNbrPorts; i++) {
> - ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
> + ret = usb_control_msg_recv(hdev, 0,
> USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, i,
> - port_status, sizeof(*port_status), 1000);
> - if (ret < 4)
> + port_status, sizeof(*port_status), 1000, GFP_KERNEL);
> + if (ret < 0)
> continue;
I'm afraid this may introduce a regression as well since the
sizeof(*port_status) is 8 for some devices and the driver only cares
about the first 4 that all devices use (i.e. it is written to handle
short reads).
> portchange = le16_to_cpu(port_status->wPortChange);
> @@ -420,13 +414,13 @@ static int lvs_rh_probe(struct usb_interface *intf,
> usb_set_intfdata(intf, lvs);
>
> /* how many number of ports this root hub has */
> - ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
> + ret = usb_control_msg_recv(hdev, 0,
> USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
> USB_DT_SS_HUB << 8, 0, &lvs->descriptor,
> - USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT);
> - if (ret < (USB_DT_HUB_NONVAR_SIZE + 2)) {
> + USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT, GFP_KERNEL);
> + if (ret < 0) {
> dev_err(&hdev->dev, "wrong root hub descriptor read %d\n", ret);
> - return ret < 0 ? ret : -EINVAL;
> + return ret;
> }
This looks like it may break for similar reasons.
Johan
next prev parent reply other threads:[~2021-01-27 15:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 18:33 [PATCH v3 00/12] drivers: usb: misc: update to use usb_control_msg_{send|recv}() API Anant Thazhemadam
2021-01-26 18:33 ` [PATCH v3 01/12] usb: misc: appledisplay: update to use the " Anant Thazhemadam
2021-01-27 13:58 ` Johan Hovold
2021-01-27 14:42 ` Anant Thazhemadam
2021-01-27 17:20 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 02/12] usb: misc: cypress_cy7c63: update to use usb_control_msg_recv() Anant Thazhemadam
2021-01-27 14:09 ` Johan Hovold
2021-01-27 14:40 ` Anant Thazhemadam
2021-01-26 18:33 ` [PATCH v3 03/12] usb: misc: cytherm: " Anant Thazhemadam
2021-01-27 14:21 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 04/12] usb: misc: ehset: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2021-01-27 14:49 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 05/12] usb: misc: ezusb: update to use usb_control_msg_send() Anant Thazhemadam
2021-01-27 14:52 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 06/12] usb: misc: iowarrior: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2021-01-27 14:59 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 07/12] usb: misc: isight_firmware: update to use usb_control_msg_send() Anant Thazhemadam
2021-01-27 15:04 ` Johan Hovold
2021-01-26 18:33 ` [PATCH v3 08/12] usb: misc: ldusb: " Anant Thazhemadam
2021-01-27 15:06 ` Johan Hovold
2021-01-26 18:39 ` [PATCH v3 09/12] usb: misc: lvstest: update to use the usb_control_msg_{send|recv}() API Anant Thazhemadam
2021-01-27 15:15 ` Johan Hovold [this message]
2021-01-26 18:40 ` [PATCH v3 10/12] usb: misc: trancevibrator: update to use usb_control_msg_send() Anant Thazhemadam
2021-01-27 15:17 ` Johan Hovold
2021-01-26 18:40 ` [PATCH v3 11/12] usb: misc: usbsevseg: " Anant Thazhemadam
2021-01-27 16:46 ` Johan Hovold
[not found] ` <20210126184043.915235-1-anant.thazhemadam@gmail.com>
2021-01-26 18:47 ` [PATCH v3 12/12] [PATCH v3 12/12] usb: misc: usbtest: update to use the, usb_control_msg_{send|recv}() API Anant Thazhemadam
2021-01-27 11:31 ` Greg Kroah-Hartman
2021-01-27 12:12 ` [RESEND PATCH v3 12/12] usb: misc: usbtest: update to use the " Anant Thazhemadam
2021-01-27 16:26 ` Alan Stern
2021-01-27 17:00 ` 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=YBGDdyfVNKOvZPJr@hovoldconsulting.com \
--to=johan@kernel.org \
--cc=anant.thazhemadam@gmail.com \
--cc=gregkh@linuxfoundation.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;
as well as URLs for NNTP newsgroup(s).