Unverified Commit 7bb9435b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12133 ALSA: line6: Fix racy access to midibuf 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuan Can <yuancan@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OH3VYBYSYXOAZFEMBV7AELQKWDDYJ63V/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAOXZ4 
 
Link:https://gitee.com/openeuler/kernel/pulls/12133

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 748eeb7d 11ad673b

sound/usb/line6/driver.c

+5 −0
Original line number Diff line number Diff line
@@ -286,12 +286,14 @@ static void line6_data_received(struct urb *urb) 
{

	struct usb_line6 *line6 = (struct usb_line6 *)urb->context;

	struct midi_buffer *mb = &line6->line6midi->midibuf_in;

	unsigned long flags;

	int done;



	if (urb->status == -ESHUTDOWN)

		return;



	if (line6->properties->capabilities & LINE6_CAP_CONTROL_MIDI) {

		spin_lock_irqsave(&line6->line6midi->lock, flags);

		done =

			line6_midibuf_write(mb, urb->transfer_buffer, urb->actual_length);
@@ -300,12 +302,15 @@ static void line6_data_received(struct urb *urb) 
			dev_dbg(line6->ifcdev, "%d %d buffer overflow - message skipped\n",

				done, urb->actual_length);

		}

		spin_unlock_irqrestore(&line6->line6midi->lock, flags);



		for (;;) {

			spin_lock_irqsave(&line6->line6midi->lock, flags);

			done =

				line6_midibuf_read(mb, line6->buffer_message,

						   LINE6_MIDI_MESSAGE_MAXLEN,

						   LINE6_MIDIBUF_READ_RX);

			spin_unlock_irqrestore(&line6->line6midi->lock, flags);



			if (done <= 0)

				break;