!32 [sync] PR-26: 修复CVE-2023-24626

From: @openeuler-sync-bot 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong

backport-CVE-2023-24626.patch

@@ -0,0 +1,43 @@
+From 6df4a48ff6b31bedc2d0216b84dbe66cf9ca5e23 Mon Sep 17 00:00:00 2001
+From: Alexander Naumov <alexander_naumov@opensuse.org>
+Date: Wed, 1 Feb 2023 13:47:57 +0200
+Subject: [PATCH] Missing signal sending permission check on failed query
+ messages
+
+When run as setuid root, one can send a query message to the
+privileged screen process via its unix socket in order to force
+it to send SIGHUP to a PID that can be freely specified in the
+query packet.
+Processes that do not explicitly handle SIGHUP will simply terminate
+
+Signed-off-by: Alexander Naumov <alexander_naumov@opensuse.org>
+---
+ socket.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/socket.c b/socket.c
+index bb68b35..0a575cf 100644
+--- a/socket.c
++++ b/socket.c
+@@ -1285,11 +1285,16 @@ ReceiveMsg()
+           else
+             queryflag = -1;
+ 
+-          Kill(m.m.command.apid,
++	  if (CheckPid(m.m.command.apid)) {
++	    Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid);
++	  }
++	  else {
++            Kill(m.m.command.apid,
+                (queryflag >= 0)
+                    ? SIGCONT
+                    : SIG_BYE); /* Send SIG_BYE if an error happened */
+-          queryflag = -1;
++            queryflag = -1;
++	  }
+         }
+         break;
+       case MSG_COMMAND:
+-- 
+2.27.0
+

screen.spec

@@ -1,19 +1,22 @@
 Name:           screen
 Epoch:          1
-Version:        4.8.0
+Version:        4.9.0
-Release:        8
+Release:        2
 Summary:        A full-screen window manager
 License:        GPLv3+
 URL:            http://www.gnu.org/software/screen
 Source0:        http://ftp.gnu.org/gnu/screen/screen-%{version}.tar.gz
 Source1:        screen.pam
 
-Patch0:         screen-4.3.1-screenrc.patch
+Patch1:         screen-4.3.1-screenrc.patch
-Patch1:         screen-E3.patch
+Patch2:         screen-E3.patch
-Patch2:         screen-4.3.1-suppress_remap.patch
+Patch3:         screen-4.3.1-suppress_remap.patch
-Patch3:         screen-4.3.1-crypt.patch
+Patch4:         screen-4.3.1-crypt.patch
+
+Patch6001:      backport-CVE-2023-24626.patch
 
 BuildRequires:  automake autoconf gcc ncurses-devel texinfo
+BuildRequires:  systemd
 Requires:       shadow-utils
 Requires(preun): info
 Requires(post):  info
@@ -41,7 +44,6 @@ autoreconf -fiv
 	--enable-colors256 \
 	--enable-rxvt_osc \
 	--enable-use-locale \
-	--enable-telnet \
 	--with-pty-mode=0620 \
 	--with-sys-screenrc="%{_sysconfdir}/screenrc" \
 	--with-socket-dir="%{_rundir}/screen"
@@ -97,13 +99,32 @@ fi
 %{_infodir}/screen.info*
 
 %changelog
+* Wed Apr 19 2023 hongjinghao <hongjinghao@huawei.com> - 1:4.9.0-2
+- fix CVE-2023-24626
+
+* Fri Oct 21 2022 hongjinghao <hongjinghao@huawei.com> - 1:4.9.0-1
+- update to 4.9.0
+
+* Sat Jun 19 2021 panxiaohe <panxiaohe@huawei.com> - 1:4.8.0-11
+- remove '--enable-telnet' in configure
+
+* Fri Jun 4 2021 panxiaohe <panxiaohe@huawei.com> - 1:4.8.0-10
+- add systemd to BuildRequires to use _tmpfilesdir macro
+- fix bogus dates in changelog
+
+* Fri Feb 26 2021 lirui<lirui130@huawei.com> - 1:4.8.0-9
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix CVE-2021-26937 
+
 * Mon Jul 27 2020 linwei<linwei54@huawei.com> - 1:4.8.0-8
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC:modify release and changelog
 
-* Tue Jul 16 2020 linwei<linwei54@huawei.com> - 1:4.8.0-7
+* Thu Jul 16 2020 linwei<linwei54@huawei.com> - 1:4.8.0-7
 - Type:enhancement
 - ID:NA
 - SUG:NA
@@ -127,10 +148,10 @@ fi
 - SUG:NA
 - DESC:add build requires of texinfo to solve the problem of build
 
-* Tue Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:4.6.2-3
+* Thu Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:4.6.2-3
 - Modify requires
 
-* Tue Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:4.6.2-2
+* Thu Sep 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:4.6.2-2
 - Adjust requires
 
 * Sat Sep 7 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:4.6.2-1