From b5c516d6975c55901ad37643d5e10b9f6c858d8d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 15 2019 14:37:11 +0000
Subject: import procps-ng-3.3.10-26.el7_7.1


---

diff --git a/SOURCES/procps-ng-3.3.10-top-segv-on-double-exit.patch b/SOURCES/procps-ng-3.3.10-top-segv-on-double-exit.patch
new file mode 100644
index 0000000..e86771d
--- /dev/null
+++ b/SOURCES/procps-ng-3.3.10-top-segv-on-double-exit.patch
@@ -0,0 +1,28 @@
+diff -up ./top/top.c.ori ./top/top.c
+--- ./top/top.c.ori	2019-08-08 17:07:57.970295504 +0200
++++ ./top/top.c	2019-08-08 17:09:02.705070742 +0200
+@@ -406,6 +406,11 @@ static void at_eoj (void) {
+          * The real program end */
+ static void bye_bye (const char *str) NORETURN;
+ static void bye_bye (const char *str) {
++   sigset_t ss;
++
++// POSIX.1-2004 async-signal-safe: sigfillset, sigprocmask
++   sigfillset(&ss);
++   sigprocmask(SIG_BLOCK, &ss, NULL);
+    at_eoj();                 // restore tty in preparation for exit
+ #ifdef ATEOJ_RPTSTD
+ {  proc_t *p;
+@@ -616,12 +621,6 @@ static void sig_abexit (int sig) {
+          *    SIGUSR1 and SIGUSR2 */
+ static void sig_endpgm (int dont_care_sig) NORETURN;
+ static void sig_endpgm (int dont_care_sig) {
+-   sigset_t ss;
+-
+-// POSIX.1-2004 async-signal-safe: sigfillset, sigprocmask
+-   sigfillset(&ss);
+-   sigprocmask(SIG_BLOCK, &ss, NULL);
+-   Frames_signal = BREAK_sig;
+    bye_bye(NULL);
+    (void)dont_care_sig;
+ } // end: sig_endpgm
diff --git a/SPECS/procps-ng.spec b/SPECS/procps-ng.spec
index d6ce2bd..69de388 100644
--- a/SPECS/procps-ng.spec
+++ b/SPECS/procps-ng.spec
@@ -4,7 +4,7 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.10
-Release: 26%{?dist}
+Release: 26%{?dist}.1
 License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -33,6 +33,7 @@ Patch18: procps-ng-3.3.10-CVE-2018-1124.patch
 Patch19: procps-ng-3.3.10-CVE-2018-1122.patch
 Patch20: procps-ng-3.3.10-recognize_sched_deadline.patch
 Patch21: procps-ng-3.3.10-free-counts-unreclaim-slabs-in-avail-mem.patch
+Patch22: procps-ng-3.3.10-top-segv-on-double-exit.patch
 
 
 Requires(post): /sbin/ldconfig
@@ -121,6 +122,7 @@ Internationalization pack for procps-ng
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 
 %build
@@ -202,6 +204,10 @@ rmdir %{buildroot}/share
 %{_datadir}/locale/*
 
 %changelog
+* Mon Sep 16 2019 Jan Rybar <jrybar@redhat.com> - 3.3.10-26.el7_7.1
+- top: segfault if killed by sigterm in batch mode
+- Resolves: rhbz#1739372
+
 * Fri Apr 12 2019 Jan Rybar <jrybar@redhat.com> - 3.3.10-26
 - free: unreclaimable slabs counted into free memory, used mem incorrect
 - Resolves: rhbz#1699264