Drop alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch b/queue-5.15/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
deleted file mode 100644 (file)
index f635410..0000000
--- a/queue-5.15/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 915524df52287d1bfbd2a205b42127c9f264c854 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Sep 2025 14:13:27 +0200
-Subject: ALSA: seq: Fix KCSAN data-race warning at snd_seq_fifo_poll_wait()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 1f9fc89cbbe8a7a8648ea2f827f7d8590e62e52c ]
-
-snd_seq_fifo_poll_wait() evaluates f->cells without locking after
-poll_wait(), and KCSAN doesn't like it as it appears to be a
-data-race.  Although this doesn't matter much in practice as the value
-is volatile, it's still better to address it for the mind piece.
-
-Wrap it with f->lock spinlock for avoiding the potential data race.
-
-Reported-by: syzbot+c3dbc239259940ededba@syzkaller.appspotmail.com
-Link: https://syzkaller.appspot.com/bug?extid=c3dbc239259940ededba
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/seq/seq_fifo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
-index f8e02e98709ab..faf288fecf26d 100644
---- a/sound/core/seq/seq_fifo.c
-+++ b/sound/core/seq/seq_fifo.c
-@@ -218,6 +218,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
-                          poll_table *wait)
- {
-       poll_wait(file, &f->input_sleep, wait);
-+      guard(spinlock_irq)(&f->lock);
-       return (f->cells > 0);
- }
- 
--- 
-2.51.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index de4439b15f0ed2d08c9a085460fe587b5fda60d7..3da0a3c105e484b1a537f28071af5041b5e20aff 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -160,7 +160,6 @@ scsi-lpfc-define-size-of-debugfs-entry-for-xri-rebal.patch
 allow-finish_no_open-file-err_ptr-e.patch
 usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch
 usb-gadget-f_fs-fix-epfile-null-pointer-access-after.patch
-alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
 usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch
 ipv6-np-rxpmtu-race-annotation.patch
 rdma-irdma-update-kconfig.patch

diff --git a/queue-6.1/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch b/queue-6.1/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
deleted file mode 100644 (file)
index 6965c0d..0000000
--- a/queue-6.1/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6935c2783dce8b8e8404bf7b933b428700c7145f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Sep 2025 14:13:27 +0200
-Subject: ALSA: seq: Fix KCSAN data-race warning at snd_seq_fifo_poll_wait()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 1f9fc89cbbe8a7a8648ea2f827f7d8590e62e52c ]
-
-snd_seq_fifo_poll_wait() evaluates f->cells without locking after
-poll_wait(), and KCSAN doesn't like it as it appears to be a
-data-race.  Although this doesn't matter much in practice as the value
-is volatile, it's still better to address it for the mind piece.
-
-Wrap it with f->lock spinlock for avoiding the potential data race.
-
-Reported-by: syzbot+c3dbc239259940ededba@syzkaller.appspotmail.com
-Link: https://syzkaller.appspot.com/bug?extid=c3dbc239259940ededba
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/seq/seq_fifo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
-index f8e02e98709ab..faf288fecf26d 100644
---- a/sound/core/seq/seq_fifo.c
-+++ b/sound/core/seq/seq_fifo.c
-@@ -218,6 +218,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
-                          poll_table *wait)
- {
-       poll_wait(file, &f->input_sleep, wait);
-+      guard(spinlock_irq)(&f->lock);
-       return (f->cells > 0);
- }
- 
--- 
-2.51.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 4800aa6f17021f5ba49288fd80ce8eb662bcade3..ce1fbcc36c7edd56d8cef7d4f9c63bc0b7c75b73 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -231,7 +231,6 @@ scsi-lpfc-define-size-of-debugfs-entry-for-xri-rebal.patch
 allow-finish_no_open-file-err_ptr-e.patch
 usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch
 usb-gadget-f_fs-fix-epfile-null-pointer-access-after.patch
-alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
 usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch
 ipv6-np-rxpmtu-race-annotation.patch
 rdma-irdma-update-kconfig.patch

diff --git a/queue-6.12/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch b/queue-6.12/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
deleted file mode 100644 (file)
index 6442bd3..0000000
--- a/queue-6.12/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From add3ea940ae495d8e001f761ec5f9adc753f1fec Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Sep 2025 14:13:27 +0200
-Subject: ALSA: seq: Fix KCSAN data-race warning at snd_seq_fifo_poll_wait()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 1f9fc89cbbe8a7a8648ea2f827f7d8590e62e52c ]
-
-snd_seq_fifo_poll_wait() evaluates f->cells without locking after
-poll_wait(), and KCSAN doesn't like it as it appears to be a
-data-race.  Although this doesn't matter much in practice as the value
-is volatile, it's still better to address it for the mind piece.
-
-Wrap it with f->lock spinlock for avoiding the potential data race.
-
-Reported-by: syzbot+c3dbc239259940ededba@syzkaller.appspotmail.com
-Link: https://syzkaller.appspot.com/bug?extid=c3dbc239259940ededba
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/seq/seq_fifo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
-index 3a10b081f129c..7dc2bd94cefc3 100644
---- a/sound/core/seq/seq_fifo.c
-+++ b/sound/core/seq/seq_fifo.c
-@@ -213,6 +213,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
-                          poll_table *wait)
- {
-       poll_wait(file, &f->input_sleep, wait);
-+      guard(spinlock_irq)(&f->lock);
-       return (f->cells > 0);
- }
- 
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 790f7d534c7d9a94e0f52d2e35d9b9de9deb95a0..c65cdcd6750710151ed70bf455d71eafe3c09c66 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -373,7 +373,6 @@ scsi-lpfc-ensure-plogi_acc-is-sent-prior-to-prli-in-.patch
 allow-finish_no_open-file-err_ptr-e.patch
 usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch
 usb-gadget-f_fs-fix-epfile-null-pointer-access-after.patch
-alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
 usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch
 f2fs-fix-infinite-loop-in-__insert_extent_tree.patch
 wifi-rtw89-obtain-rx-path-from-ppdu-status-ie00.patch

diff --git a/queue-6.17/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch b/queue-6.17/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
deleted file mode 100644 (file)
index 376f5e7..0000000
--- a/queue-6.17/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bfae597f3d84b25095d81957b77eb47711f15100 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Sep 2025 14:13:27 +0200
-Subject: ALSA: seq: Fix KCSAN data-race warning at snd_seq_fifo_poll_wait()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 1f9fc89cbbe8a7a8648ea2f827f7d8590e62e52c ]
-
-snd_seq_fifo_poll_wait() evaluates f->cells without locking after
-poll_wait(), and KCSAN doesn't like it as it appears to be a
-data-race.  Although this doesn't matter much in practice as the value
-is volatile, it's still better to address it for the mind piece.
-
-Wrap it with f->lock spinlock for avoiding the potential data race.
-
-Reported-by: syzbot+c3dbc239259940ededba@syzkaller.appspotmail.com
-Link: https://syzkaller.appspot.com/bug?extid=c3dbc239259940ededba
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/seq/seq_fifo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
-index 3a10b081f129c..7dc2bd94cefc3 100644
---- a/sound/core/seq/seq_fifo.c
-+++ b/sound/core/seq/seq_fifo.c
-@@ -213,6 +213,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
-                          poll_table *wait)
- {
-       poll_wait(file, &f->input_sleep, wait);
-+      guard(spinlock_irq)(&f->lock);
-       return (f->cells > 0);
- }
- 
--- 
-2.51.0
-

diff --git a/queue-6.17/series b/queue-6.17/series
index e4932f420aac55b0724930ff08213bbae3bc1dd2..798bc8f316d3c6d700efd868500fcdc0c477e868 100644 (file)
--- a/queue-6.17/series
+++ b/queue-6.17/series
@@ -577,7 +577,6 @@ scsi-lpfc-ensure-plogi_acc-is-sent-prior-to-prli-in-.patch
 allow-finish_no_open-file-err_ptr-e.patch
 usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch
 usb-gadget-f_fs-fix-epfile-null-pointer-access-after.patch
-alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
 usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch
 f2fs-fix-infinite-loop-in-__insert_extent_tree.patch
 wifi-rtw89-disable-rtw89_physts_ie09_ftr_0-for-ppdu-.patch

diff --git a/queue-6.6/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch b/queue-6.6/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
deleted file mode 100644 (file)
index 9b7d2e7..0000000
--- a/queue-6.6/alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ebe89af21c317445b9f03e1909c4912328d09e86 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Sep 2025 14:13:27 +0200
-Subject: ALSA: seq: Fix KCSAN data-race warning at snd_seq_fifo_poll_wait()
-
-From: Takashi Iwai <tiwai@suse.de>
-
-[ Upstream commit 1f9fc89cbbe8a7a8648ea2f827f7d8590e62e52c ]
-
-snd_seq_fifo_poll_wait() evaluates f->cells without locking after
-poll_wait(), and KCSAN doesn't like it as it appears to be a
-data-race.  Although this doesn't matter much in practice as the value
-is volatile, it's still better to address it for the mind piece.
-
-Wrap it with f->lock spinlock for avoiding the potential data race.
-
-Reported-by: syzbot+c3dbc239259940ededba@syzkaller.appspotmail.com
-Link: https://syzkaller.appspot.com/bug?extid=c3dbc239259940ededba
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/core/seq/seq_fifo.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/core/seq/seq_fifo.c b/sound/core/seq/seq_fifo.c
-index f8e02e98709ab..faf288fecf26d 100644
---- a/sound/core/seq/seq_fifo.c
-+++ b/sound/core/seq/seq_fifo.c
-@@ -218,6 +218,7 @@ int snd_seq_fifo_poll_wait(struct snd_seq_fifo *f, struct file *file,
-                          poll_table *wait)
- {
-       poll_wait(file, &f->input_sleep, wait);
-+      guard(spinlock_irq)(&f->lock);
-       return (f->cells > 0);
- }
- 
--- 
-2.51.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 8c5faf5148ae2d0ba38d13e2540a2fa183340984..b1b996d1cfaaca386da7a78187df65e193d7756c 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -245,7 +245,6 @@ scsi-lpfc-define-size-of-debugfs-entry-for-xri-rebal.patch
 allow-finish_no_open-file-err_ptr-e.patch
 usb-mon-increase-buff_max-to-64-mib-to-support-multi.patch
 usb-gadget-f_fs-fix-epfile-null-pointer-access-after.patch
-alsa-seq-fix-kcsan-data-race-warning-at-snd_seq_fifo.patch
 usb-xhci-plat-facilitate-using-autosuspend-for-xhci-.patch
 f2fs-fix-infinite-loop-in-__insert_extent_tree.patch
 ipv6-np-rxpmtu-race-annotation.patch