2 files changed, 29 insertions, 10 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 4cfbb5480..e9ecab925 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -111,6 +111,7 @@ calligrawords
 cameramonitor
 cantata
 catfish
+cawbird
 celluloid
 checkbashisms
 cheese
@@ -136,6 +137,7 @@ code
 code-oss
 com.github.dahenson.agenda
 com.github.johnfactotum.Foliate
+com.gitlab.newsflash
 conkeror
 conky
 conplay
@@ -238,6 +240,7 @@ freemind
 freeoffice-planmaker
 freeoffice-presentations
 freeoffice-textmaker
+freetube
 freshclam
 frogatto
 frozen-bubble
@@ -333,6 +336,7 @@ hedgewars
 hexchat
 highlight
 hitori
+homebank
 host
 hugin
 hyperrogue
@@ -436,6 +440,7 @@ mate-calculator
 mate-color-select
 mate-dictionary
 mathematica
+mattermost-desktop
 mcabber
 mediainfo
 mediathekview
@@ -448,6 +453,7 @@ meteo-qt
 midori
 min
 mindless
+minecraft-launcher
 minetest
 mirrormagic
 mocp
@@ -502,6 +508,7 @@ neverball
 neverputt
 newsbeuter
 newsboat
+newsflash
 nheko
 nicotine
 nitroshare
@@ -536,7 +543,7 @@ orage
 ostrichriders
 out123
 palemoon
-pandoc
+#pandoc
 parole
 patch
 pavucontrol
@@ -778,6 +785,7 @@ xfburn
 xfce4-dict
 xfce4-mixer
 xfce4-notes
+xfce4-screenshooter
 xiphos
 xlinks
 xmms
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 6bfc80903..3aa0584d6 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -957,16 +957,27 @@ int remove_overlay_directory(void) {
         return 0;
 }
 
+// flush stdin if it is connected to a tty and has input
 void flush_stdin(void) {
-        if (isatty(STDIN_FILENO)) {
-                int cnt = 0;
-                int rv = ioctl(STDIN_FILENO, FIONREAD, &cnt);
-                if (rv == 0 && cnt) {
-                        fwarning("removing %d bytes from stdin\n", cnt);
-                        rv = ioctl(STDIN_FILENO, TCFLSH, TCIFLUSH);
-                        (void) rv;
-                }
-        }
+        if (!isatty(STDIN_FILENO))
+                return;
+
+        int cnt = 0;
+        int rv = ioctl(STDIN_FILENO, FIONREAD, &cnt);
+        if (rv != 0 || cnt == 0)
+                return;
+
+        fwarning("removing %d bytes from stdin\n", cnt);
+
+        // If this process is backgrounded, below ioctl() will trigger
+        // SIGTTOU and stop us. We avoid this by ignoring SIGTTOU for
+        // the duration of the ioctl.
+        sighandler_t hdlr = signal(SIGTTOU, SIG_IGN);
+        rv = ioctl(STDIN_FILENO, TCFLSH, TCIFLUSH);
+        signal(SIGTTOU, hdlr);
+
+        if (rv)
+                fwarning("Flushing stdin failed: %s\n", strerror(errno));
 }
 
 // return 1 if new directory was created, else return 0