pool/util-linux
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1121456 from home:Guillaume_G:branches:Base:System

Browse Source 
- Add patch:
  * setterm-resize-uninit-flags.patch

OBS-URL: https://build.opensuse.org/request/show/1121456
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=533
This commit is contained in:
Jan Engelhardt 2023-10-31 16:34:51 +00:00 committed by Git OBS Bridge
parent 81aa838370
commit c952799170
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
setterm-resize-uninit-flags.patch Normal file
View File

@ -0,0 +1,38 @@
From: Chris Hofstaedtler <zeha@debian.org>
Date: Mon, 30 Oct 2023 22:59:33 +0100
Subject: setterm: avoid restoring flags from uninitialized memory
Depending on the used compiler and flags, previously either F_SETFL was called
with 0 or with a random value. Never with the intended previous flags.
Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
---
term-utils/setterm.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 22afc76..a477d5d 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -846,7 +846,11 @@ static void tty_raw(struct termios *saved_attributes, int *saved_fl)
{
struct termios tattr;
- fcntl(STDIN_FILENO, F_GETFL, saved_fl);
+ *saved_fl = fcntl(STDIN_FILENO, F_GETFL);
+ if (*saved_fl == -1) {
+ err(EXIT_FAILURE, _("fcntl failed: %s"),
+ strerror(errno));
+ }
tcgetattr(STDIN_FILENO, saved_attributes);
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
memcpy(&tattr, saved_attributes, sizeof(struct termios));
@@ -898,7 +902,7 @@ static int resizetty(void)
ssize_t rc;
struct winsize ws;
struct termios saved_attributes;
- int saved_fl;
+ int saved_fl = 0;
if (!isatty(STDIN_FILENO))
errx(EXIT_FAILURE, _("stdin does not refer to a terminal"));

6
util-linux.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 31 13:20:38 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Add patch:
* setterm-resize-uninit-flags.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 8 20:13:24 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com> Fri Sep 8 20:13:24 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>

2
util-linux.spec
View File

@ -116,6 +116,8 @@ Patch4: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch
Patch5: util-linux-fix-tests-with-64k-pagesize.patch Patch5: util-linux-fix-tests-with-64k-pagesize.patch
# https://github.com/util-linux/util-linux/pull/2100 # https://github.com/util-linux/util-linux/pull/2100
Patch6: use-logind-not-utmp.patch Patch6: use-logind-not-utmp.patch
# https://salsa.debian.org/debian/util-linux/-/raw/master/debian/patches/debian/setterm-resize-uninit-flags.patch?inline=false
Patch7: setterm-resize-uninit-flags.patch
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc