summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch')
-rw-r--r--debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch b/debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch
index a0942062a..fbad6b678 100644
--- a/debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch
+++ b/debian/patches-rt/0317-printk-ignore-consoles-without-write-callback.patch
@@ -1,8 +1,8 @@
-From 7efd125170f344b124a00390d8d7b714beac1698 Mon Sep 17 00:00:00 2001
+From 27913b1edcba54aae3d70a249824ae5f2ebfae60 Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Fri, 17 Feb 2023 09:53:44 +0106
Subject: [PATCH 317/323] printk: ignore consoles without write() callback
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
The ttynull driver does not provide an implementation for the write()
callback. This leads to a NULL pointer dereference in the related
@@ -22,7 +22,7 @@ Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
1 file changed, 6 insertions(+)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index d2205872304d..64747c72fbea 100644
+index ea7a14a485382..831f0b0ebef5b 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2267,6 +2267,10 @@ static int printk_kthread_func(void *data)
@@ -36,7 +36,7 @@ index d2205872304d..64747c72fbea 100644
con->thread = kthread_run(printk_kthread_func, con,
"pr/%s%d", con->name, con->index);
if (IS_ERR(con->thread)) {
-@@ -3566,6 +3570,8 @@ bool pr_flush(int timeout_ms, bool reset_on_progress)
+@@ -3589,6 +3593,8 @@ bool pr_flush(int timeout_ms, bool reset_on_progress)
for_each_console(con) {
if (!(con->flags & CON_ENABLED))
continue;
@@ -46,5 +46,5 @@ index d2205872304d..64747c72fbea 100644
if (printk_seq < seq)
diff += seq - printk_seq;
--
-2.43.0
+2.44.0