diff options
-rw-r--r-- | meta/recipes-extended/screen/screen/CVE-2023-24626.patch | 40 | ||||
-rw-r--r-- | meta/recipes-extended/screen/screen_4.9.0.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-extended/screen/screen/CVE-2023-24626.patch b/meta/recipes-extended/screen/screen/CVE-2023-24626.patch new file mode 100644 index 0000000000..73caf9d81b --- /dev/null +++ b/meta/recipes-extended/screen/screen/CVE-2023-24626.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Naumov <alexander_naumov@opensuse.org> | ||
3 | Date: Mon, 30 Jan 2023 17:22:25 +0200 | ||
4 | Subject: fix: missing signal sending permission check on failed query messages | ||
5 | |||
6 | Signed-off-by: Alexander Naumov <alexander_naumov@opensuse.org> | ||
7 | |||
8 | CVE: CVE-2023-24626 | ||
9 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/screen.git/commit/?id=e9ad41bfedb4537a6f0de20f00b27c7739f168f7] | ||
10 | Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> | ||
11 | --- | ||
12 | socket.c | 9 +++++++-- | ||
13 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/socket.c b/socket.c | ||
16 | index bb68b35..9d87445 100644 | ||
17 | --- a/socket.c | ||
18 | +++ b/socket.c | ||
19 | @@ -1285,11 +1285,16 @@ ReceiveMsg() | ||
20 | else | ||
21 | queryflag = -1; | ||
22 | |||
23 | - Kill(m.m.command.apid, | ||
24 | + if (CheckPid(m.m.command.apid)) { | ||
25 | + Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); | ||
26 | + } | ||
27 | + else { | ||
28 | + Kill(m.m.command.apid, | ||
29 | (queryflag >= 0) | ||
30 | ? SIGCONT | ||
31 | : SIG_BYE); /* Send SIG_BYE if an error happened */ | ||
32 | - queryflag = -1; | ||
33 | + queryflag = -1; | ||
34 | + } | ||
35 | } | ||
36 | break; | ||
37 | case MSG_COMMAND: | ||
38 | -- | ||
39 | 2.25.1 | ||
40 | |||
diff --git a/meta/recipes-extended/screen/screen_4.9.0.bb b/meta/recipes-extended/screen/screen_4.9.0.bb index b36173b8de..19070d87d8 100644 --- a/meta/recipes-extended/screen/screen_4.9.0.bb +++ b/meta/recipes-extended/screen/screen_4.9.0.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ | |||
21 | file://0002-comm.h-now-depends-on-term.h.patch \ | 21 | file://0002-comm.h-now-depends-on-term.h.patch \ |
22 | file://0001-fix-for-multijob-build.patch \ | 22 | file://0001-fix-for-multijob-build.patch \ |
23 | file://0001-Remove-more-compatibility-stuff.patch \ | 23 | file://0001-Remove-more-compatibility-stuff.patch \ |
24 | file://CVE-2023-24626.patch \ | ||
24 | " | 25 | " |
25 | 26 | ||
26 | SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" | 27 | SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4" |