Skip to content

L
linux
Commit f7ef7614 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv() 

The usb_control_msg_send() and usb_control_msg_recv() calls can return
an error if a "short" write/read happens, and they can handle data off
of the stack, so move the driver over to using those calls instead,
saving some logic when dynamically allocating memory.

Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Vasily Khoruzhick <anarsoul@gmail.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200914153756.3412156-9-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aea67cc1
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 57 deletions
sound/usb/line6/driver.c
View file @ f7ef7614
...@@ -337,23 +337,18 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data, ...@@ -337,23 +337,18 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
{ {
struct usb_device *usbdev = line6->usbdev; struct usb_device *usbdev = line6->usbdev;
int ret; int ret;
unsigned char *len; u8 len;
unsigned count; unsigned count;
if (address > 0xffff || datalen > 0xff) if (address > 0xffff || datalen > 0xff)
return -EINVAL; return -EINVAL;
len = kmalloc(1, GFP_KERNEL);
if (!len)
return -ENOMEM;
/* query the serial number: */ /* query the serial number: */
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_send(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
(datalen << 8) | 0x21, address, (datalen << 8) | 0x21, address, NULL, 0,
NULL, 0, LINE6_TIMEOUT * HZ); LINE6_TIMEOUT * HZ);
if (ret) {
if (ret < 0) {
dev_err(line6->ifcdev, "read request failed (error %d)\n", ret); dev_err(line6->ifcdev, "read request failed (error %d)\n", ret);
goto exit; goto exit;
} }
...@@ -362,45 +357,41 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data, ...@@ -362,45 +357,41 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) { for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
mdelay(LINE6_READ_WRITE_STATUS_DELAY); mdelay(LINE6_READ_WRITE_STATUS_DELAY);
ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_recv(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
USB_DIR_IN, 0x0012, 0x0000, &len, 1,
0x0012, 0x0000, len, 1, LINE6_TIMEOUT * HZ);
LINE6_TIMEOUT * HZ); if (ret) {
if (ret < 0) {
dev_err(line6->ifcdev, dev_err(line6->ifcdev,
"receive length failed (error %d)\n", ret); "receive length failed (error %d)\n", ret);
goto exit; goto exit;
} }
if (*len != 0xff) if (len != 0xff)
break; break;
} }
ret = -EIO; ret = -EIO;
if (*len == 0xff) { if (len == 0xff) {
dev_err(line6->ifcdev, "read failed after %d retries\n", dev_err(line6->ifcdev, "read failed after %d retries\n",
count); count);
goto exit; goto exit;
} else if (*len != datalen) { } else if (len != datalen) {
/* should be equal or something went wrong */ /* should be equal or something went wrong */
dev_err(line6->ifcdev, dev_err(line6->ifcdev,
"length mismatch (expected %d, got %d)\n", "length mismatch (expected %d, got %d)\n",
(int)datalen, (int)*len); (int)datalen, len);
goto exit; goto exit;
} }
/* receive the result: */ /* receive the result: */
ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_recv(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x0013, 0x0000, data, datalen, 0x0013, 0x0000, data, datalen, LINE6_TIMEOUT * HZ);
LINE6_TIMEOUT * HZ); if (ret)
if (ret < 0)
dev_err(line6->ifcdev, "read failed (error %d)\n", ret); dev_err(line6->ifcdev, "read failed (error %d)\n", ret);
exit: exit:
kfree(len);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(line6_read_data); EXPORT_SYMBOL_GPL(line6_read_data);
...@@ -423,12 +414,10 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data, ...@@ -423,12 +414,10 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
if (!status) if (!status)
return -ENOMEM; return -ENOMEM;
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_send(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x0022, address, data, datalen, 0x0022, address, data, datalen, LINE6_TIMEOUT * HZ);
LINE6_TIMEOUT * HZ); if (ret) {
if (ret < 0) {
dev_err(line6->ifcdev, dev_err(line6->ifcdev,
"write request failed (error %d)\n", ret); "write request failed (error %d)\n", ret);
goto exit; goto exit;
...@@ -437,14 +426,10 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data, ...@@ -437,14 +426,10 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) { for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
mdelay(LINE6_READ_WRITE_STATUS_DELAY); mdelay(LINE6_READ_WRITE_STATUS_DELAY);
ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), ret = usb_control_msg_recv(usbdev, 0, 0x67,
0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | 0x0012, 0x0000, status, 1, LINE6_TIMEOUT * HZ);
USB_DIR_IN, if (ret) {
0x0012, 0x0000,
status, 1, LINE6_TIMEOUT * HZ);
if (ret < 0) {
dev_err(line6->ifcdev, dev_err(line6->ifcdev,
"receiving status failed (error %d)\n", ret); "receiving status failed (error %d)\n", ret);
goto exit; goto exit;
......
sound/usb/line6/podhd.c
View file @ f7ef7614
...@@ -183,29 +183,25 @@ static const struct attribute_group podhd_dev_attr_group = { ...@@ -183,29 +183,25 @@ static const struct attribute_group podhd_dev_attr_group = {
static int podhd_dev_start(struct usb_line6_podhd *pod) static int podhd_dev_start(struct usb_line6_podhd *pod)
{ {
int ret; int ret;
u8 *init_bytes; u8 init_bytes[8];
int i; int i;
struct usb_device *usbdev = pod->line6.usbdev; struct usb_device *usbdev = pod->line6.usbdev;
init_bytes = kmalloc(8, GFP_KERNEL); ret = usb_control_msg_send(usbdev, 0,
if (!init_bytes)
return -ENOMEM;
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
0x11, 0, 0x11, 0,
NULL, 0, LINE6_TIMEOUT * HZ); NULL, 0, LINE6_TIMEOUT * HZ);
if (ret < 0) { if (ret) {
dev_err(pod->line6.ifcdev, "read request failed (error %d)\n", ret); dev_err(pod->line6.ifcdev, "read request failed (error %d)\n", ret);
goto exit; goto exit;
} }
/* NOTE: looks like some kind of ping message */ /* NOTE: looks like some kind of ping message */
ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_recv(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0x11, 0x0, 0x11, 0x0,
init_bytes, 3, LINE6_TIMEOUT * HZ); init_bytes, 3, LINE6_TIMEOUT * HZ);
if (ret < 0) { if (ret) {
dev_err(pod->line6.ifcdev, dev_err(pod->line6.ifcdev,
"receive length failed (error %d)\n", ret); "receive length failed (error %d)\n", ret);
goto exit; goto exit;
...@@ -220,13 +216,12 @@ static int podhd_dev_start(struct usb_line6_podhd *pod) ...@@ -220,13 +216,12 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)
goto exit; goto exit;
} }
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), ret = usb_control_msg_send(usbdev, 0,
USB_REQ_SET_FEATURE, USB_REQ_SET_FEATURE,
USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_DIR_OUT,
1, 0, 1, 0,
NULL, 0, LINE6_TIMEOUT * HZ); NULL, 0, LINE6_TIMEOUT * HZ);
exit: exit:
kfree(init_bytes);
return ret; return ret;
} }
......
sound/usb/line6/toneport.c
View file @ f7ef7614
...@@ -126,11 +126,11 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2) ...@@ -126,11 +126,11 @@ static int toneport_send_cmd(struct usb_device *usbdev, int cmd1, int cmd2)
{ {
int ret; int ret;
ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, ret = usb_control_msg_send(usbdev, 0, 0x67,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ); cmd1, cmd2, NULL, 0, LINE6_TIMEOUT * HZ);
if (ret < 0) { if (ret) {
dev_err(&usbdev->dev, "send failed (error %d)\n", ret); dev_err(&usbdev->dev, "send failed (error %d)\n", ret);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7