ALSA: line6: Improve line6_read/write_data() interfaces
PATCH v2 1/1 ALSA: line6: Improve line6_read/write_data() interfaces
The address cannot be negative so make it unsigned. Also, an unsigned int is always sufficient for the length, so no need to overdo it with a size_t. Finally, add in range checks to see if the values passed in actually fit where they are used.
---
This was dropped from an earlier series ("Cleanup reads/writes to Line 6 device memory".) This version leaves the arguements wide (within reason) and does range checking.
Regards,
Chris
sound/usb/line6/driver.c | 14 ++++++++++---- sound/usb/line6/driver.h | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-)
sound/usb/line6/driver.c +10 -4
@@ -302,14 +302,17 @@ static void line6_data_received(struct urb *urb)/* Read data from device. */ -int line6_read_data (struct usb_line6 *line6,int address,void *data, -size_t datalen) +int line6_read_data (struct usb_line6 *line6,unsigned address,void *data, +unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char len;unsigned count; +if (address >0xffff || datalen >0xff ) +return EINVAL ; +/* query the serial number: */ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
@@ -370,14 +373,17 @@ EXPORT_SYMBOL_GPL(line6_read_data);/* Write data to device. */ -int line6_write_data (struct usb_line6 *line6,int address,void *data, -size_t datalen) +int line6_write_data (struct usb_line6 *line6,unsigned address,void *data, +unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char status;int count; +if (address >0xffff || datalen >0xffff ) +return EINVAL ; + ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, 0x0022, address, data, datalen,
sound/usb/line6/driver.h +4 -4
@@ -147,8 +147,8 @@ struct usb_line6 {extern char *line6_alloc_sysex_buffer (struct usb_line6 *line6,int code1,int code2,int size); -extern int line6_read_data (struct usb_line6 *line6,int address,void *data, -size_t datalen); +extern int line6_read_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen);extern int line6_read_serial_number (struct usb_line6 *line6,u32 *serial_number); extern int line6_send_raw_message_async(struct usb_line6 *line6,
@@ -161,8 +161,8 @@ extern void line6_start_timer(struct timer_list *timer, unsigned long msecs,void (*function)(unsigned long ), unsigned long data);extern int line6_version_request_async (struct usb_line6 *line6); -extern int line6_write_data (struct usb_line6 *line6,int address,void *data, -size_t datalen); +extern int line6_write_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen); int line6_probe(struct usb_interface *interface, const struct usb_device_id *id,
Signature · 1 line
2.1.0
At Wed, 11 Feb 2015 06:03:31 -0600,
Quoted 30 lines · Chris Rorvick
The address cannot be negative so make it unsigned. Also, an unsigned int is always sufficient for the length, so no need to overdo it with a
size_t. Finally, add in range checks to see if the values passed in actually fit where they are used.Signed-off-by Chris Rorvick <[email protected]>---
This was dropped from an earlier series ("Cleanup reads/writes to Line 6 device memory".) This version leaves the arguements wide (within reason) and does range checking.Regards,
Chris
sound/usb/line6/driver.c | 14 ++++++++++---- sound/usb/line6/driver.h | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-)sound/usb/line6/driver.c +0
-2@@ -302,14 +302,17 @@ static void line6_data_received(struct urb *urb)/* Read data from device. */ -int line6_read_data (struct usb_line6 *line6,int address,void *data, -size_t datalen)
sound/usb/line6/driver.c static void line6_data_received(struct urb *urb) · line 314
Quoted 10 lines
sound/usb/line6/driver.c +4
-0+int line6_read_data (struct usb_line6 *line6,unsigned address,void *data, +unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char len;unsigned count; +if (address >0xffff || datalen >0xff ) +return EINVAL ;
-EINVAL.
Takashi
Quoted 52 lines
sound/usb/line6/driver.c +5
-2/* query the serial number: */ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,@@ -370,14 +373,17 @@ EXPORT_SYMBOL_GPL(line6_read_data);/* Write data to device. */ -int line6_write_data (struct usb_line6 *line6,int address,void *data, -size_t datalen) +int line6_write_data (struct usb_line6 *line6,unsigned address,void *data, +unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char status;int count; +if (address >0xffff || datalen >0xffff ) +return EINVAL ; + ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, 0x0022, address, data, datalen,sound/usb/line6/driver.h +4
-4@@ -147,8 +147,8 @@ struct usb_line6 {extern char *line6_alloc_sysex_buffer (struct usb_line6 *line6,int code1,int code2,int size); -extern int line6_read_data (struct usb_line6 *line6,int address,void *data, -size_t datalen); +extern int line6_read_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen);extern int line6_read_serial_number (struct usb_line6 *line6,u32 *serial_number); extern int line6_send_raw_message_async(struct usb_line6 *line6,@@ -161,8 +161,8 @@ extern void line6_start_timer(struct timer_list *timer, unsigned long msecs,void (*function)(unsigned long ), unsigned long data);extern int line6_version_request_async (struct usb_line6 *line6); -extern int line6_write_data (struct usb_line6 *line6,int address,void *data, -size_t datalen); +extern int line6_write_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen); int line6_probe(struct usb_interface *interface, const struct usb_device_id *id,Signature · 1 line
2.1.0
Quoted 13 lines · Takashi Iwai
At Wed, 11 Feb 2015 06:03:31 -0600,
Quoted 10 lines · Chris Rorvick
The address cannot be negative so make it unsigned. Also, an unsigned int is always sufficient for the length, so no need to overdo it with a
size_t. Finally, add in range checks to see if the values passed in actually fit where they are used.Signed-off-by Chris Rorvick <[email protected]>---
This was dropped from an earlier series ("Cleanup reads/writes to Line 6 device memory".) This version leaves the arguements wide (within
reason)
Quoted 10 lines
Quoted 10 lines
and does range checking.
Regards,
Chris
sound/usb/line6/driver.c | 14 ++++++++++---- sound/usb/line6/driver.h | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-)
Quoted 11 lines
sound/usb/line6/driver.c static void line6_data_received(struct urb *urb) · line 305
Quoted 11 lines
sound/usb/line6/driver.c +1
-2@@ -302,14 +302,17 @@ static void line6_data_received(struct urb *urb)/* Read data from device. */ -int line6_read_data (struct usb_line6 *line6,int address,void *data, -size_t datalen) +int line6_read_data(struct usb_line6 *line6, unsigned address, void
*data,
Quoted 11 lines
sound/usb/line6/driver.c static void line6_data_received(struct urb *urb) · line 314
Quoted 9 lines
sound/usb/line6/driver.c +3
-0+ unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char len;unsigned count; +if (address >0xffff || datalen >0xff ) +return EINVAL ;
-EINVAL.
Stupid, sorry. This isn't very important, I can just let this die. :-)
Quoted 6 lines
Takashi
Quoted 3 lines
sound/usb/line6/driver.c +0
-0/* query the serial number: */ ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE |
USB_DIR_OUT,
Quoted 7 lines
sound/usb/line6/driver.c EXPORT_SYMBOL_GPL(line6_read_data); · line 376
Quoted 7 lines
sound/usb/line6/driver.c +1
-2@@ -370,14 +373,17 @@ EXPORT_SYMBOL_GPL(line6_read_data);/* Write data to device. */ -int line6_write_data (struct usb_line6 *line6,int address,void *data, -size_t datalen) +int line6_write_data(struct usb_line6 *line6, unsigned address, void
*data,
Quoted 7 lines
Quoted 7 lines
sound/usb/line6/driver.c +1
-0+ unsigned datalen) {struct usb_device *usbdev = line6->usbdev;int ret;unsigned char status;int count;
Quoted 5 lines
sound/usb/line6/driver.c EXPORT_SYMBOL_GPL(line6_read_data);
Quoted 5 lines
sound/usb/line6/driver.c +3
-0+if (address >0xffff || datalen >0xffff ) +return EINVAL ; + ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE |
USB_DIR_OUT,
Quoted 8 lines
sound/usb/line6/driver.h struct usb_line6 { · line 148
Quoted 8 lines
sound/usb/line6/driver.c +0
-00x0022, address, data, datalen,sound/usb/line6/driver.h +0
-0@@ -147,8 +147,8 @@ struct usb_line6 { extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int
code1,
Quoted 2 lines
sound/usb/line6/driver.h struct usb_line6 { · line 150
Quoted 2 lines
sound/usb/line6/driver.h +0
-1int code2, int size); -extern int line6_read_data(struct usb_line6 *line6, int address, void
*data,
Quoted 7 lines
sound/usb/line6/driver.h extern void line6_start_timer(struct timer_list
Quoted 7 lines
sound/usb/line6/driver.h +2
-1- size_t datalen); +extern int line6_read_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen);extern int line6_read_serial_number (struct usb_line6 *line6,u32 *serial_number); extern int line6_send_raw_message_async(struct usb_line6 *line6,@@ -161,8 +161,8 @@ extern void line6_start_timer(struct timer_list
*timer, unsigned long msecs,
Quoted 4 lines
sound/usb/line6/driver.h extern void line6_start_timer(struct timer_list *timer, unsigned long msecs,
Quoted 4 lines
sound/usb/line6/driver.h +0
-1void (*function)(unsigned long ), unsigned long data);extern int line6_version_request_async (struct usb_line6 *line6); -extern int line6_write_data(struct usb_line6 *line6, int address, void
*data,
Quoted 9 lines
Quoted 9 lines
sound/usb/line6/driver.h +2
-2- size_t datalen); +extern int line6_write_data (struct usb_line6 *line6,unsigned address, +void *data,unsigned datalen); int line6_probe(struct usb_interface *interface, const struct usb_device_id *id, --2.1.0