FAILED: patch "[PATCH] ALSA: firewire-motu: Protect register DSP event queue" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 98fb1c1bb11e29eb609b7200a25e136e05aa4498
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060436-askew-mundane-fd77@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 98fb1c1bb11e29eb609b7200a25e136e05aa4498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A1ssio=20Gabriel?= <[email protected]>
Date: Thu, 21 May 2026 08:01:23 -0300
Subject: [PATCH] ALSA: firewire-motu: Protect register DSP event queue
positions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The register DSP event queue is updated under parser->lock, but snd_motu_register_dsp_message_parser_count_event() reads pull_pos and push_pos without the lock. snd_motu_register_dsp_message_parser_copy_event() also reads both queue positions before taking the lock.
Protect these accesses with parser->lock as well. This keeps the hwdep poll/read path consistent with the producer side and with the cached meter/parameter accessors.
sound/firewire/motu/motu-register-dsp-message-parser.c +7 -4
@@ -386,6 +386,8 @@ unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *m {struct msg_parser *parser = motu->message_parser; +guard (spinlock_irqsave)(&parser->lock); +if (parser->pull_pos > parser->push_pos)return EVENT_QUEUE_SIZE - parser->pull_pos + parser->push_pos;else
@@ -395,13 +397,14 @@ unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *mbool snd_motu_register_dsp_message_parser_copy_event (struct snd_motu *motu,u32 *event) {struct msg_parser *parser = motu->message_parser; -unsigned int pos = parser->pull_pos; - -if (pos == parser->push_pos) -return false; +unsigned int pos;guard (spinlock_irqsave)(&parser->lock); +if (parser->pull_pos == parser->push_pos) +return false; + + pos = parser->pull_pos; *event = parser->event_queue[pos]; ++pos;
Sasha Levin
maintainerPATCH 1/1 ALSA: firewire-motu: Protect register DSP event queue positions
From: Cássio Gabriel <[email protected]>
[ Upstream commit 98fb1c1bb11e29eb609b7200a25e136e05aa4498 ]
The register DSP event queue is updated under parser->lock, but snd_motu_register_dsp_message_parser_count_event() reads pull_pos and push_pos without the lock. snd_motu_register_dsp_message_parser_copy_event() also reads both queue positions before taking the lock.
Protect these accesses with parser->lock as well. This keeps the hwdep poll/read path consistent with the producer side and with the cached meter/parameter accessors.
--- .../motu/motu-register-dsp-message-parser.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/firewire/motu/motu-register-dsp-message-parser.c +7 -7
@@ -393,6 +393,8 @@ unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *m {struct msg_parser *parser = motu->message_parser; +guard (spinlock_irqsave)(&parser->lock); +if (parser->pull_pos > parser->push_pos)return EVENT_QUEUE_SIZE - parser->pull_pos + parser->push_pos;else
@@ -402,14 +404,14 @@ unsigned int snd_motu_register_dsp_message_parser_count_event(struct snd_motu *mbool snd_motu_register_dsp_message_parser_copy_event (struct snd_motu *motu,u32 *event) {struct msg_parser *parser = motu->message_parser; -unsigned int pos = parser->pull_pos; -unsigned long flags; +unsigned int pos; -if (pos == parser->push_pos) -return false; +guard (spinlock_irqsave)(&parser->lock); -spin_lock_irqsave (&parser->lock, flags); +if (parser->pull_pos == parser->push_pos) +return false; + pos = parser->pull_pos; *event = parser->event_queue[pos]; ++pos;
@@ -417,7 +419,5 @@ bool snd_motu_register_dsp_message_parser_copy_event(struct snd_motu *motu, u32 pos =0 ; parser->pull_pos = pos; -spin_unlock_irqrestore (&parser->lock, flags); -return true; }
Signature · 1 line
2.53.0