From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EF87183CA6; Mon, 12 Aug 2024 16:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723479092; cv=none; b=kEh2pCGVylaZ8bMXX/6epniUQyzBuV5PK+I6vd0nkiMxKsxlyktAc7TNb2bhAZfhNgkJFz+AR/ljT75BUJp6FnZ2XCItjmIZFdgsZFYZNwcWx2OWzwPM5ym3uVS3TiRTVxme7cGB55lBiPJ+lo5NAff9wwmW3eys2VmkaXJHX04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723479092; c=relaxed/simple; bh=gJyi/tkCJosgJmf6jwNTYQ2JDLzCkpgTNQUQUjm80qo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ht70SCeVFowtVoh13A23qckzzMSzMT0ZFSwfzEFuo/Bn11Dzg+KIxYH54YraKoqsbxJbZaSuIvE2io8ecjVC+lGm9NgVJ0rQ4oMi44zZfA8Vkzlv+jbP2k8sK98FWIwsiyh0oVVci+rOWvYrqERamE+fVt8et17WeZSzREQ8Kis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tyq95Ize; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tyq95Ize" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8E0FC4AF0D; Mon, 12 Aug 2024 16:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723479092; bh=gJyi/tkCJosgJmf6jwNTYQ2JDLzCkpgTNQUQUjm80qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tyq95IzeslpO+RpAM6K5pc8f5O7mjXaogbK0OLFJ/hP1a8YwKX6b9WdzdiTqnml58 dPsazbez2a3EkqDOZrnJd/I9gXmUCfNBWgmSJ0f2Kf3k67xPL43loApsZb6GE/AUxz aGGmrM6ZGNnRo0DohUlITu/WHzE6oq4THYeL+FUI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+78eccfb8b3c9a85fc6c5@syzkaller.appspotmail.com, Takashi Iwai Subject: [PATCH 6.1 089/150] ALSA: line6: Fix racy access to midibuf Date: Mon, 12 Aug 2024 18:02:50 +0200 Message-ID: <20240812160128.601471828@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240812160125.139701076@linuxfoundation.org> References: <20240812160125.139701076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 15b7a03205b31bc5623378c190d22b7ff60026f1 upstream. There can be concurrent accesses to line6 midibuf from both the URB completion callback and the rawmidi API access. This could be a cause of KMSAN warning triggered by syzkaller below (so put as reported-by here). This patch protects the midibuf call of the former code path with a spinlock for avoiding the possible races. Reported-by: syzbot+78eccfb8b3c9a85fc6c5@syzkaller.appspotmail.com Closes: https://lore.kernel.org/00000000000000949c061df288c5@google.com Cc: Link: https://patch.msgid.link/20240805130129.10872-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/line6/driver.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -286,12 +286,14 @@ static void line6_data_received(struct u { 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 u 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;