[PATCH 2/2] Xinit: close stdin to avoid leak of file descriptior to the Xorg session.
Matěj Cepl
mcepl at redhat.com
Mon Jul 25 16:52:28 PDT 2011
Signed-off-by: Matěj Cepl <mcepl at redhat.com>
---
xinit.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/xinit.c b/xinit.c
index 42ff008..7f56aab 100644
--- a/xinit.c
+++ b/xinit.c
@@ -91,6 +91,8 @@ char xserverrcbuf[256];
#define TRUE 1
#define FALSE 0
+#define OK_EXIT 0
+#define ERR_EXIT 1
static char *default_server = "X";
static char *default_display = ":0"; /* choose most efficient */
@@ -561,6 +563,7 @@ startClient(char *client[])
{
clientpid = fork();
if (clientpid == 0) {
+ int fd;
set_environment();
setWindowPath();
@@ -568,7 +571,16 @@ startClient(char *client[])
Error("cannot change uid");
_exit(EXIT_FAILURE);
}
- setpgid(0, getpid());
+ fd = open ("/dev/null", O_RDONLY);
+
+ if (fd < 0) {
+ Error("cannot open /dev/null: %s\n", strerror(errno));
+ _exit(ERR_EXIT);
+ }
+ close (STDIN_FILENO);
+ dup2 (fd, STDIN_FILENO);
+ close (fd);
+ setsid();
Execute(client);
Error("Unable to run program \"%s\"", client[0]);
--
1.7.6
More information about the xorg-devel
mailing list