5 changed files with 76 additions and 49 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/stalld-1.17.1.tar.bz2
+SOURCES/stalld-1.19.1.tar.bz2
--- a/.stalld.metadata
+++ b/.stalld.metadata
@ -1 +1 @@
-449566fc8c5f8568a92ed0a04d15c31d64878741 SOURCES/stalld-1.17.1.tar.bz2
+5830e75cdc32cf0953ce9f223c9074681211c0d8 SOURCES/stalld-1.19.1.tar.bz2
--- a/SOURCES/Make-fill_process_comm-open-comm-file-as-READ_ONLY.patch
+++ b/SOURCES/Make-fill_process_comm-open-comm-file-as-READ_ONLY.patch
@ -0,0 +1,34 @@
+From f9c0ade7cd9a514d4ca6f81f797284e11c56b31a Mon Sep 17 00:00:00 2001
+From: Chris White <chwhite@redhat.com>
+Date: Wed, 21 Feb 2024 15:22:44 -0500
+Subject: [PATCH] Make fill_process_comm() open comm file as READ_ONLY
+
+The fill_process_comm() opens the comm file using O_RDWR. The
+function itself does not perform a write operation on the file,
+and opening this in read and write mode can cause selinux policy
+violations where opening the file with write permission is
+restricted. Since the function itself only needs to read from this
+fd, changing this to READ_ONLY (O_RDONLY)
+
+Signed-off-by: Chris White <chwhite@redhat.com>
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ src/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index f6feca7040d8..898f4a5d06a7 100644
+--- a/src/utils.c
+++ b/src/utils.c
+@@ -55,7 +55,7 @@ int fill_process_comm(int tgid, int pid, char *comm, int comm_size)
+ 	if (retval < 0)
+ 		goto out_error;
+ 
+-	fd = open(path, O_RDWR);
+	fd = open(path, O_RDONLY);
+ 	if (fd < 0) {
+ 		log_msg("failed to open comm file at %s\n", path);
+ 		goto out_error;
+-- 
+2.43.0
+
--- a/SOURCES/Start-stalld-service-as-initrc_t.patch
+++ b/SOURCES/Start-stalld-service-as-initrc_t.patch
@ -1,27 +0,0 @@
-From 476152742021303d2defeb69f524bcc302618081 Mon Sep 17 00:00:00 2001
-From: Leah Leshchinsky <lleshchi@redhat.com>
-Date: Mon, 29 Aug 2022 14:07:39 -0400
-Subject: [PATCH] Start stalld service as initrc_t
-
-Stalld currently runs as an unconfined_service_t.
-
-Edit to service file so that the daemon is launched as an initrc_t.
-
-Signed-off-by: Leah Leshchinsky <lleshchi@redhat.com>
-
-diff --git a/redhat/stalld.service b/redhat/stalld.service
-index e0eb4b77b0a7..bcd4b767f629 100644
--- a/redhat/stalld.service
-+++ b/redhat/stalld.service
-@@ -9,7 +9,7 @@ ExecStartPre=/usr/bin/throttlectl off
- 
- # In case the regex passed to IT or IP includes C escape sequences,
- # use ${IT} or ${IP} instead of $IT or $IP
-ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP
-+ExecStart=/bin/sh -c "/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP"
- ExecStopPost=/usr/bin/throttlectl on
- CPUSchedulingPolicy=fifo
- CPUSchedulingPriority=10
-- 
-2.31.1
-
--- a/SPECS/stalld.spec
+++ b/SPECS/stalld.spec
@ -1,6 +1,6 @@
 Name:		stalld
-Version:	1.17.1
-Release:	1%{?dist}
+Version:	1.19.1
+Release:	2%{?dist}
 Summary:	Daemon that finds starving tasks and gives them a temporary boost

 License:	GPLv2
@ -14,7 +14,16 @@ BuildRequires:	systemd-rpm-macros

 Requires:	systemd

-Patch0:         Start-stalld-service-as-initrc_t.patch
+%ifnarch i686
+BuildRequires:	bpftool
+BuildRequires:	clang
+BuildRequires:	libbpf-devel
+
+Requires:	libbpf
+%endif
+
+# Patches
+Patch1: Make-fill_process_comm-open-comm-file-as-READ_ONLY.patch

 %description
 The stalld program monitors the set of system threads,
@ -32,7 +41,7 @@ allow 10 microseconds of runtime for 1 second of clock time.

 %install
 %make_install DOCDIR=%{_docdir} MANDIR=%{_mandir} BINDIR=%{_bindir} DATADIR=%{_datadir} VERSION=%{version}
-%make_install -C redhat UNITDIR=%{_unitdir}
+%make_install -C systemd UNITDIR=%{_unitdir}

 %files
 %{_bindir}/%{name}
@ -53,19 +62,23 @@ allow 10 microseconds of runtime for 1 second of clock time.
 %systemd_postun_with_restart %{name}.service

 %changelog
-* Fri Oct 21 2022 Leah Leshchinsky <lleshchi@redhat.com> - 1.17.1-1
+* Wed Feb 21 2024 John Kacur <jkacur@redhat.com> - 1.19.1-2
+-  Make fill_process_comm() open comm file as READ_ONLY
+Resolves: RHEL-25846
+
+* Fri Feb 09 2024 John Kacur <jkacur@redhat.com> - 1.19.1-1
+- Rebase to upstream stalld-1.19.1
+Resolves: RHEL-7865
+
+* Tue Oct 18 2022 Leah Leshchinsky <lleshchi@redhat.com> - 1.17.1-1
 - stalld: Fix memory leak in print_boosted_info()
 - utils: Check if the system is in lockdown mode
 - stalld: print process comm and cpu when boosting
-Resolves: rhbz#2136559
-
-* Tue Sep 13 2022 Leah Leshchinsky <lleshchi@redhat.com> - 1.17-2
- Start stalld service as initrc_t
-Resolves:rhbz#2126494
+Resolves: rhbz#2120799

 * Thu Jul 14 2022 John Kacur <jkacur@redhat.com> - 1.17-1
 - rebase to upstream v1.17
-Resolves:rhbz#2107273
+Resolves:rhbz#2107275

 * Thu Mar 31 2022 Fernando Pacheco <fpacheco@redhat.com> - 1.16-1
 - stald/utils: Space, lines and voids clenaups
@ -74,7 +87,7 @@ Resolves:rhbz#2107273
 - src/utils: Comments cleanup
 - src/throttling: Comments cleanup
 - src/stalld.h Comments cleanup
-  Resolves: rhbz#2068549
+  Resolves: rhbz#2068550

 * Mon Nov 15 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.15-1
 - stalld: Fix incorrect open() return value checks
@ -84,7 +97,11 @@ Resolves:rhbz#2107273
 - tests: Fix uninitialized value action.sa_mask
 - utils: Bail if malloc() returns null in parse_cpu_list()
 - stalld: Use correct format specifier for long types
-  Resolves: rhbz#1990057, rhbz#1996799, rhbz#1996825
+  Resolves: rhbz#2016010
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.1-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

 * Mon Jul 19 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.14.1-1
 - stalld: Coding style cleanup
@ -97,7 +114,7 @@ Resolves:rhbz#2107273
 - stalld: Adjust variables in parse_old_task_format()
 - utils.c: Use MAX_PATH for pidfile
 - stalld.c: Remove variable declaration from the middle of  the function
- stalld: Respect -l option in single threaded mode (1983100)
+- stalld: Respect -l option in single threaded mode (1983103)
 - utils: s/try_to_open_file/check_file_exists/
 - utils: use check_file_exists in setup_hr_tick()
 - utils: Check for the new sched_features path
@ -108,22 +125,22 @@ Resolves:rhbz#2107273
 - stalld: Add the adaptive mode option
 - stalld: Use the last mode set in the cmdline
 - stalld: Fallback to the adaptive mode if force_fifo is selected
- stalld: Make single-threaded mode the default one (1920041)
+- stalld: Make single-threaded mode the default one
 - stalld.service: Always restart stalld on exit
 - utils.c: Fail if user is not root
- utils.c: Make the path to sched_debug path dynamic (1977663)
+- utils.c: Make the path to sched_debug path dynamic

 * Tue Jun 29 2021 Fernando Pacheco <fpacheco@redhat.com> - 1.12-1
 - stalld.8: fix diff cruft left in manpage source
 - stalld.c: clean up handling of nr_running
- stalld.c: remove duplicate parameter to fill_waiting_task() (1934582)
+- stalld.c: remove duplicate parameter to fill_waiting_task()
+- stalld: Add error handling in get_cpu_idle_time()
 - stalld.service: Run stalld as sched_fifo via systemd
- stalld: Add error handling in get_cpu_idle_time() (1966259)
- packaging: clean up Makefiles and rpm specfile (1972806)
+- packaging: clean up Makefiles and rpm specfile
 - stalld: Always print current function for info messages
 - stalld: Always print current function for warn messages
 - stalld: Always print current function for die messages
- utils: change PATHMAX to 4096 (1934581)
+- utils: change PATHMAX to 4096

 * Thu May 13 2021 Clark Williams <williams@redhat.com> - 1.11-1
 - redhat/stalld.spec: pick up gating test version for changelog
@ -135,6 +152,9 @@ Resolves:rhbz#2107273
 - stalld: Support denylisting of tasks in stalld
 - src/utils: use right argument for warning printf

+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
 * Wed Feb 17 2021 Clark Williams <williams@redhat.com> - 1.9-2
 - update to pick up latest gating test