From: Greg Kroah-Hartman Date: Tue, 3 Dec 2024 08:30:55 +0000 (+0100) Subject: drop staging-greybus-uart-fix-atomicity-violation-in-get_.patch X-Git-Tag: v4.19.325~62 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fda1f448d7a61371a9b2de0014f79f0d8e5e5347;p=thirdparty%2Fkernel%2Fstable-queue.git drop staging-greybus-uart-fix-atomicity-violation-in-get_.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index 8e725d981f1..689d490627b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -227,7 +227,6 @@ usb-chaoskey-fail-open-after-removal.patch usb-chaoskey-fix-possible-deadlock-chaoskey_list_loc.patch misc-apds990x-fix-missing-pm_runtime_disable.patch staging-greybus-uart-clean-up-tiocgserial.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch alsa-hda-realtek-add-type-for-alc287.patch alsa-hda-realtek-update-alc256-depop-procedure.patch apparmor-fix-do-simple-duplicate-message-elimination.patch diff --git a/queue-5.10/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-5.10/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index f12e0027df4..00000000000 --- a/queue-5.10/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 063dd345b5a511167552b9dfcd2dd8fc565f48bf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index 5cdc5dff9f55b..257f917a93745 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -611,11 +611,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 9667f5fedcc..328d7248709 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -279,7 +279,6 @@ usb-chaoskey-fail-open-after-removal.patch usb-chaoskey-fix-possible-deadlock-chaoskey_list_loc.patch misc-apds990x-fix-missing-pm_runtime_disable.patch counter-stm32-timer-cnt-add-check-for-clk_enable.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch alsa-hda-realtek-update-alc256-depop-procedure.patch apparmor-fix-do-simple-duplicate-message-elimination.patch parisc-fix-a-possible-dma-corruption.patch diff --git a/queue-5.15/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-5.15/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index 185c22d5093..00000000000 --- a/queue-5.15/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From be8fa963ec0b0e359b07ab763a7a10f460e2ddde Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index dc4ed0ff1ae27..b6b136d6a691d 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -597,11 +597,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 8f11be87db1..f5febee87eb 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -139,7 +139,6 @@ usb-chaoskey-fail-open-after-removal.patch usb-chaoskey-fix-possible-deadlock-chaoskey_list_loc.patch misc-apds990x-fix-missing-pm_runtime_disable.patch staging-greybus-uart-clean-up-tiocgserial.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch apparmor-fix-do-simple-duplicate-message-elimination.patch usb-ehci-spear-fix-call-balance-of-sehci-clk-handling-routines.patch cgroup-make-operations-on-the-cgroup-root_list-rcu-safe.patch diff --git a/queue-5.4/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-5.4/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index b983c989ad8..00000000000 --- a/queue-5.4/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c24368adc983d40ef1080a6c1d3b40d4393614d9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index b8da6dc5d4d4d..ae83255e9046c 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -622,11 +622,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 00a6c14a214..10949a0ce2e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -338,7 +338,6 @@ usb-chaoskey-fix-possible-deadlock-chaoskey_list_loc.patch misc-apds990x-fix-missing-pm_runtime_disable.patch counter-stm32-timer-cnt-add-check-for-clk_enable.patch counter-ti-ecap-capture-add-check-for-clk_enable.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch alsa-hda-realtek-update-alc256-depop-procedure.patch apparmor-fix-do-simple-duplicate-message-elimination.patch asoc-amd-yc-fix-for-enabling-dmic-on-acp6x-via-_dsd-.patch diff --git a/queue-6.1/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-6.1/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index 3b3e6251da2..00000000000 --- a/queue-6.1/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4006fbd05de7a109badd548ef342d6342a260f7a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index 90ff07f2cbf76..2d6c4ae8482d1 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -597,11 +597,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 2bace1ecfe6..e0f480b9123 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -609,7 +609,6 @@ phy-realtek-usb-fix-null-deref-in-rtk_usb3phy_probe.patch counter-stm32-timer-cnt-add-check-for-clk_enable.patch counter-ti-ecap-capture-add-check-for-clk_enable.patch bus-mhi-host-switch-trace_mhi_gen_tre-fields-to-nati.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch usb-typec-fix-potential-array-underflow-in-ucsi_ccg_.patch firmware_loader-fix-possible-resource-leak-in-fw_log.patch alsa-hda-realtek-update-alc256-depop-procedure.patch diff --git a/queue-6.11/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-6.11/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index 340b08e0497..00000000000 --- a/queue-6.11/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e8bafbd69daff04cb6743120a3fdb4ef5c14b59c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index cdf4ebb93b104..8eab94cb06faf 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -596,11 +596,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-6.12/series b/queue-6.12/series index bcd8c25187f..31f0099c266 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -606,7 +606,6 @@ phy-realtek-usb-fix-null-deref-in-rtk_usb3phy_probe.patch counter-stm32-timer-cnt-add-check-for-clk_enable.patch counter-ti-ecap-capture-add-check-for-clk_enable.patch bus-mhi-host-switch-trace_mhi_gen_tre-fields-to-nati.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch usb-typec-fix-potential-array-underflow-in-ucsi_ccg_.patch firmware_loader-fix-possible-resource-leak-in-fw_log.patch alsa-hda-realtek-update-alc256-depop-procedure.patch diff --git a/queue-6.12/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-6.12/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index e41c2d934bc..00000000000 --- a/queue-6.12/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 61937fd741031632e0a1337553e51b754748ca0d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index cdf4ebb93b104..8eab94cb06faf 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -596,11 +596,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 3119aa2cd96..a4c667c2873 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -439,7 +439,6 @@ usb-chaoskey-fix-possible-deadlock-chaoskey_list_loc.patch misc-apds990x-fix-missing-pm_runtime_disable.patch counter-stm32-timer-cnt-add-check-for-clk_enable.patch counter-ti-ecap-capture-add-check-for-clk_enable.patch -staging-greybus-uart-fix-atomicity-violation-in-get_.patch firmware_loader-fix-possible-resource-leak-in-fw_log.patch alsa-hda-realtek-update-alc256-depop-procedure.patch drm-radeon-add-helper-rdev_to_drm-rdev.patch diff --git a/queue-6.6/staging-greybus-uart-fix-atomicity-violation-in-get_.patch b/queue-6.6/staging-greybus-uart-fix-atomicity-violation-in-get_.patch deleted file mode 100644 index 96a2100d52d..00000000000 --- a/queue-6.6/staging-greybus-uart-fix-atomicity-violation-in-get_.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d4311c0085500a28ff42adaf0d7776c9d938a021 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2024 19:33:37 +0800 -Subject: staging: greybus: uart: Fix atomicity violation in get_serial_info() - -From: Qiu-ji Chen - -[ Upstream commit fe0ebeafc3b723b2f8edf27ecec6d353b08397df ] - -Our static checker found a bug where set_serial_info() uses a mutex, but -get_serial_info() does not. Fortunately, the impact of this is relatively -minor. It doesn't cause a crash or any other serious issues. However, if a -race condition occurs between set_serial_info() and get_serial_info(), -there is a chance that the data returned by get_serial_info() will be -meaningless. - -Signed-off-by: Qiu-ji Chen -Fixes: 0aad5ad563c8 ("greybus/uart: switch to ->[sg]et_serial()") -Reviewed-by: Johan Hovold -Reviewed-by: Dan Carpenter -Reviewed-by: Alex Elder -Link: https://lore.kernel.org/r/20241107113337.402042-1-chenqiuji666@gmail.com -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/staging/greybus/uart.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c -index 999ce613dca81..a8b794616ec5b 100644 ---- a/drivers/staging/greybus/uart.c -+++ b/drivers/staging/greybus/uart.c -@@ -596,11 +596,13 @@ static int get_serial_info(struct tty_struct *tty, - struct gb_tty *gb_tty = tty->driver_data; - - ss->line = gb_tty->minor; -+ mutex_lock(&gb_tty->port.mutex); - ss->close_delay = jiffies_to_msecs(gb_tty->port.close_delay) / 10; - ss->closing_wait = - gb_tty->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ? - ASYNC_CLOSING_WAIT_NONE : - jiffies_to_msecs(gb_tty->port.closing_wait) / 10; -+ mutex_unlock(&gb_tty->port.mutex); - - return 0; - } --- -2.43.0 -