From: Ray Strode <rstrode@redhat.com>
Date: Mon, 10 Jun 2013 14:44:56 +0000 (-0400)
Subject: terminal-session: plug /dev/console fd leak
X-Git-Tag: 0.9.0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41560df672d0aeb954874b6d0aa81849ab35ca71;p=thirdparty%2Fplymouth.git

terminal-session: plug /dev/console fd leak

When we stop redirecting console messages, we temporarly open
/dev/console.  We don't ever close it.

This commit fixes that.
---

diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c
index 3d437094..e7377e97 100644
--- a/src/libply/ply-terminal-session.c
+++ b/src/libply/ply-terminal-session.c
@@ -213,8 +213,12 @@ ply_terminal_session_unredirect_console (ply_terminal_session_t *session)
   assert (session->console_is_redirected);
 
   fd = open ("/dev/console", O_RDWR | O_NOCTTY);
-  if (fd >= 0)
+  if (fd >= 0) {
     ioctl (fd, TIOCCONS);
+    close (fd);
+  } else {
+    ply_trace ("couldn't open /dev/console to stop redirecting it: %m");
+  }
 
   session->console_is_redirected = false;
 }