From: Takashi Iwai <tiwai@suse.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: himadrispandya@gmail.com, dvyukov@google.com,
linux-usb@vger.kernel.org, perex@perex.cz, tiwai@suse.com,
stern@rowland.harvard.ed, linux-kernel@vger.kernel.org,
marcel@holtmann.org, johan.hedberg@gmail.com,
linux-bluetooth@vger.kernel.org, alsa-devel@alsa-project.org
Subject: Re: [PATCH 07/10] sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv()
Date: Wed, 02 Sep 2020 16:36:58 +0200 [thread overview]
Message-ID: <s5heenk9red.wl-tiwai@suse.de> (raw)
In-Reply-To: <20200902110115.1994491-8-gregkh@linuxfoundation.org>
On Wed, 02 Sep 2020 13:01:09 +0200,
Greg Kroah-Hartman wrote:
>
> The usb_control_msg_send() and usb_control_msg_recv() calls can return
> an error if a "short" write/read happens, so move the driver over to
> using those calls instead, saving some logic in the wrapper functions
> that were being used in this driver.
>
> This also resolves a long-staging bug where data on the stack was being
> sent in a USB control message, which was not allowed.
>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: alsa-devel@alsa-project.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
thanks,
Takashi
> ---
> sound/usb/6fire/firmware.c | 38 +++++++++++++-------------------------
> 1 file changed, 13 insertions(+), 25 deletions(-)
>
> diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
> index 69137c14d0dc..5b8994070c96 100644
> --- a/sound/usb/6fire/firmware.c
> +++ b/sound/usb/6fire/firmware.c
> @@ -158,29 +158,17 @@ static int usb6fire_fw_ihex_init(const struct firmware *fw,
> static int usb6fire_fw_ezusb_write(struct usb_device *device,
> int type, int value, char *data, int len)
> {
> - int ret;
> -
> - ret = usb_control_msg(device, usb_sndctrlpipe(device, 0), type,
> - USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> - value, 0, data, len, HZ);
> - if (ret < 0)
> - return ret;
> - else if (ret != len)
> - return -EIO;
> - return 0;
> + return usb_control_msg_send(device, 0, type,
> + USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> + value, 0, data, len, HZ);
> }
>
> static int usb6fire_fw_ezusb_read(struct usb_device *device,
> int type, int value, char *data, int len)
> {
> - int ret = usb_control_msg(device, usb_rcvctrlpipe(device, 0), type,
> - USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value,
> - 0, data, len, HZ);
> - if (ret < 0)
> - return ret;
> - else if (ret != len)
> - return -EIO;
> - return 0;
> + return usb_control_msg_recv(device, 0, type,
> + USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
> + value, 0, data, len, HZ);
> }
>
> static int usb6fire_fw_fpga_write(struct usb_device *device,
> @@ -230,7 +218,7 @@ static int usb6fire_fw_ezusb_upload(
> /* upload firmware image */
> data = 0x01; /* stop ezusb cpu */
> ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
> - if (ret < 0) {
> + if (ret) {
> kfree(rec);
> release_firmware(fw);
> dev_err(&intf->dev,
> @@ -242,7 +230,7 @@ static int usb6fire_fw_ezusb_upload(
> while (usb6fire_fw_ihex_next_record(rec)) { /* write firmware */
> ret = usb6fire_fw_ezusb_write(device, 0xa0, rec->address,
> rec->data, rec->len);
> - if (ret < 0) {
> + if (ret) {
> kfree(rec);
> release_firmware(fw);
> dev_err(&intf->dev,
> @@ -257,7 +245,7 @@ static int usb6fire_fw_ezusb_upload(
> if (postdata) { /* write data after firmware has been uploaded */
> ret = usb6fire_fw_ezusb_write(device, 0xa0, postaddr,
> postdata, postlen);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&intf->dev,
> "unable to upload ezusb firmware %s: post urb.\n",
> fwname);
> @@ -267,7 +255,7 @@ static int usb6fire_fw_ezusb_upload(
>
> data = 0x00; /* resume ezusb cpu */
> ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&intf->dev,
> "unable to upload ezusb firmware %s: end message.\n",
> fwname);
> @@ -302,7 +290,7 @@ static int usb6fire_fw_fpga_upload(
> end = fw->data + fw->size;
>
> ret = usb6fire_fw_ezusb_write(device, 8, 0, NULL, 0);
> - if (ret < 0) {
> + if (ret) {
> kfree(buffer);
> release_firmware(fw);
> dev_err(&intf->dev,
> @@ -327,7 +315,7 @@ static int usb6fire_fw_fpga_upload(
> kfree(buffer);
>
> ret = usb6fire_fw_ezusb_write(device, 9, 0, NULL, 0);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&intf->dev,
> "unable to upload fpga firmware: end urb.\n");
> return ret;
> @@ -363,7 +351,7 @@ int usb6fire_fw_init(struct usb_interface *intf)
> u8 buffer[12];
>
> ret = usb6fire_fw_ezusb_read(device, 1, 0, buffer, 8);
> - if (ret < 0) {
> + if (ret) {
> dev_err(&intf->dev,
> "unable to receive device firmware state.\n");
> return ret;
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-09-02 14:37 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 11:01 [PATCH 00/10] USB: new USB control message helper functions Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 01/10] USB: move snd_usb_pipe_sanity_check into the USB core Greg Kroah-Hartman
2020-09-02 14:35 ` Takashi Iwai
2020-09-07 14:42 ` Greg Kroah-Hartman
2020-09-03 0:45 ` Alan Stern
2020-09-03 6:40 ` Takashi Iwai
2020-09-03 7:32 ` Greg Kroah-Hartman
2020-09-07 14:16 ` Greg Kroah-Hartman
2020-09-07 14:24 ` Alan Stern
2020-09-02 11:01 ` [PATCH 02/10] USB: add usb_control_msg_send() and usb_control_msg_recv() Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 03/10] USB: core: message.c: use usb_control_msg_send() in a few places Greg Kroah-Hartman
2020-09-02 11:23 ` Andy Shevchenko
2020-09-02 11:01 ` [PATCH 04/10] USB: core: hub.c: " Greg Kroah-Hartman
2020-09-02 14:57 ` Alan Stern
2020-09-02 15:21 ` Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 05/10] USB: legousbtower: use usb_control_msg_recv() Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 06/10] sound: usx2y: move to use usb_control_msg_send() Greg Kroah-Hartman
2020-09-02 14:36 ` Takashi Iwai
2020-09-02 11:01 ` [PATCH 07/10] sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv() Greg Kroah-Hartman
2020-09-02 14:36 ` Takashi Iwai [this message]
2020-09-02 11:01 ` [PATCH 7/9] sound: line6: convert to use new usb control function Greg Kroah-Hartman
2020-09-02 14:41 ` Takashi Iwai
2020-09-02 15:22 ` Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 8/9] sound: 6fire: move to use new usb control functions Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 08/10] sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv() Greg Kroah-Hartman
2020-09-02 14:38 ` Takashi Iwai
2020-09-02 11:01 ` [PATCH 9/9] sound: hiface: convert to use new usb_control functions Greg Kroah-Hartman
2020-09-02 11:01 ` [PATCH 09/10] sound: hiface: move to use usb_control_msg_send() Greg Kroah-Hartman
2020-09-02 14:40 ` Takashi Iwai
2020-09-02 11:01 ` [PATCH 10/10] Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv() 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=s5heenk9red.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=dvyukov@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=himadrispandya@gmail.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=perex@perex.cz \
--cc=stern@rowland.harvard.ed \
--cc=tiwai@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).