From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795024696; b=NWnNzoFErFBHWxyM8G2xChIw+ZR+A7+eZDx2QXqE4za7+s2YBJHA6oapKooSGPY0T4sQ KIV1kzsBcz2hDbgfibKEa00MUReYlGLMTpHGckMAtgZxh+UEzYytu9eLPxDevB8xef7v9 K2wTWv6OH9XoWvlLcrU1sE9HOTkhZ1Phi330k1KcW3N7NGOCe7bU+YrFt4Hf2ZHd4DeGL NKAoi/JE3oH3TF6UIS0i1zdvmuQXb0uT0SD0jp5uW91DTgCJqaPAri1PPI/NTKSwxNESn lThedlEKmi9GL3UcO3kFQxIzrtgn0qpDZpKIoPcgYiXvCM41oj5kjMJktX2C3VV/nlg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024696; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=8Tp2H08np+7dFY72ztxLVOw1ZY4PDuoYWIvNlsTTydk=; b=tOCi/MqhMLd/OXhlWzJHLsV9PpsvV0tH4TkHCf7cmH8+/z3qsKmwlSCr0P47IclXqTJA BNH70ViAfH8uq3K5it6nP++bmIOMUuGnBT45KdRIe3sLvIIuwTXDisjas8EktrlKD1mRf VaXLafMJoIUf1+Aks/AMA7DpDPVb1/KSYL5VUsILGe+S0hMHKeMITaw7EpjttjaD/qBPG upDukWnAAKLGVDScAWyF0XPVubsSGBSgp7HtoDC5BB/eICyl5md20/rav7AfwQPTMb8eA axEbNmmc/Z2MQS/1+3onQtFhqLGzTD+ORkrJ+ebvyozLrFjqciPg/mcdWId5dRk+R4Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=SKXI6t6k; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14F73606A31C; Wed, 18 Nov 2026 17:58:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=SKXI6t6k Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A91F1F000C4; Wed, 18 Nov 2026 17:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024695; bh=8Tp2H08np+7dFY72ztxLVOw1ZY4PDuoYWIvNlsTTydk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SKXI6t6kFzDOXxM2ufdjXhcoEs1qNtp0AkNZFHG8JJD3EBS3FWrchbGHOY9m053WV 9aEHWspsZjVlfMo54w/Fg/6sPlh1g4988pILTML0XJMuedQOUcnJtth/LKBOScG+wS 1us36+i4WMOCVTA8BQGjJC48TerMqrtNxceQ3/UU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Niko Huuskonen , Takashi Iwai , Sasha Levin Subject: [PATCH 6.18 0816/2151] ALSA: caiaq: Serialize access to the EP1 command buffer Date: Wed, 18 Nov 2026 15:42:31 +0100 Message-ID: <20261118150151.848858632@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Niko Huuskonen [ Upstream commit a718fd03e1e00211cf4662f5ab82d33f4c18e2a7 ] snd_usb_caiaq_send_command() and snd_usb_caiaq_send_command_bank() copy the command into cdev->ep1_out_buf and send it with a synchronous bulk transfer. Nothing serializes their callers. An ALSA control write, which sets the LEDs on the Kore controllers and several other devices, can run at the same time as a PCM prepare, which sends the audio parameters through the same buffer. One caller can then overwrite the buffer while the transfer of the other is still in flight, and the device receives a mix of both commands. Protect the buffer with a mutex. All callers run in process context and already sleep in usb_bulk_msg(). The problem was found by code review while adding another user of the buffer, the Kore LCD support later in this series. It has not been observed or reproduced. Fixes: 8e3cd08ed8e5 ("[ALSA] caiaq - add control API and more input features") Assisted-by: LLM Signed-off-by: Niko Huuskonen Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20260927003532.289468-2-niko.huuskonen.00@gmail.com Signed-off-by: Sasha Levin --- sound/usb/caiaq/device.c | 5 +++++ sound/usb/caiaq/device.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index f604846ec6e6f..e8619bb743581 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -212,6 +212,8 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *cdev, if (len > EP1_BUFSIZE - 1) len = EP1_BUFSIZE - 1; + guard(mutex)(&cdev->ep1_out_mutex); + if (buffer && len > 0) memcpy(cdev->ep1_out_buf+1, buffer, len); @@ -235,6 +237,8 @@ int snd_usb_caiaq_send_command_bank(struct snd_usb_caiaqdev *cdev, if (len > EP1_BUFSIZE - 2) len = EP1_BUFSIZE - 2; + guard(mutex)(&cdev->ep1_out_mutex); + if (buffer && len > 0) memcpy(cdev->ep1_out_buf+2, buffer, len); @@ -443,6 +447,7 @@ static int create_card(struct usb_device *usb_dev, cdev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor), le16_to_cpu(usb_dev->descriptor.idProduct)); spin_lock_init(&cdev->spinlock); + mutex_init(&cdev->ep1_out_mutex); *cardp = card; return 0; diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h index 1c6f34693fa81..822d872c8ad1a 100644 --- a/sound/usb/caiaq/device.h +++ b/sound/usb/caiaq/device.h @@ -2,6 +2,8 @@ #ifndef CAIAQ_DEVICE_H #define CAIAQ_DEVICE_H +#include + #include "../usbaudio.h" #define USB_VID_NATIVEINSTRUMENTS 0x17cc @@ -68,6 +70,7 @@ struct snd_usb_caiaqdev { unsigned char ep1_in_buf[EP1_BUFSIZE]; unsigned char ep1_out_buf[EP1_BUFSIZE]; + struct mutex ep1_out_mutex; /* protects ep1_out_buf */ unsigned char midi_out_buf[EP1_BUFSIZE]; struct caiaq_device_spec spec; -- 2.53.0