|
 |
c83c6d |
From 6dee7eadd1b7352ec503ea04fa1639d4a93f370b Mon Sep 17 00:00:00 2001
|
|
|
c83c6d |
From: Nils Philippsen <nils@redhat.com>
|
|
|
c83c6d |
Date: Thu, 16 Aug 2012 11:18:31 +0200
|
|
|
c83c6d |
Subject: [PATCH] patch: close-fds
|
|
|
c83c6d |
|
|
|
c83c6d |
Squashed commit of the following:
|
|
|
c83c6d |
|
|
|
c83c6d |
commit 4fdedd3a8b66fb42b2d4dde62df28c78571c1c5d
|
|
|
c83c6d |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
c83c6d |
Date: Fri Nov 19 12:15:58 2010 +0100
|
|
|
c83c6d |
|
|
|
c83c6d |
don't leak file descriptors to help browser process (#455450)
|
|
|
c83c6d |
---
|
|
|
c83c6d |
src/xsane.c | 43 +++++++++++++++++++++++++++++++++++++++++++
|
|
|
c83c6d |
1 file changed, 43 insertions(+)
|
|
|
c83c6d |
|
|
|
c83c6d |
diff --git a/src/xsane.c b/src/xsane.c
|
|
|
c83c6d |
index 775610e..1c5d61d 100644
|
|
|
c83c6d |
--- a/src/xsane.c
|
|
|
c83c6d |
+++ b/src/xsane.c
|
|
|
c83c6d |
@@ -48,6 +48,8 @@
|
|
|
c83c6d |
|
|
|
c83c6d |
#include <sys/wait.h>
|
|
|
c83c6d |
|
|
|
c83c6d |
+#include <stdarg.h>
|
|
|
c83c6d |
+
|
|
|
c83c6d |
/* ---------------------------------------------------------------------------------------------------------------------- */
|
|
|
c83c6d |
|
|
|
c83c6d |
struct option long_options[] =
|
|
|
c83c6d |
@@ -3684,6 +3686,41 @@ static void xsane_show_gpl(GtkWidget *widget, gpointer data)
|
|
|
c83c6d |
|
|
|
c83c6d |
/* ---------------------------------------------------------------------------------------------------------------------- */
|
|
|
c83c6d |
|
|
|
c83c6d |
+static void xsane_close_fds_for_exec(signed int first_fd_to_leave_open, ...)
|
|
|
c83c6d |
+{
|
|
|
c83c6d |
+ int open_max;
|
|
|
c83c6d |
+ signed int i;
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ va_list ap;
|
|
|
c83c6d |
+ unsigned char *close_fds;
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ open_max = (int) sysconf (_SC_OPEN_MAX);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ close_fds = malloc (open_max);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ memset (close_fds, 1, open_max);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ va_start (ap, first_fd_to_leave_open);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ for (i = first_fd_to_leave_open; i >= 0; i = va_arg (ap, signed int)) {
|
|
|
c83c6d |
+ if (i < open_max)
|
|
|
c83c6d |
+ close_fds[i] = 0;
|
|
|
c83c6d |
+ }
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ va_end (ap);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ DBG(DBG_info, "closing unneeded file descriptors\n");
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ for (i = 0; i < open_max; i++) {
|
|
|
c83c6d |
+ if (close_fds[i])
|
|
|
c83c6d |
+ close (i);
|
|
|
c83c6d |
+ }
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+ free (close_fds);
|
|
|
c83c6d |
+}
|
|
|
c83c6d |
+
|
|
|
c83c6d |
+/* ---------------------------------------------------------------------------------------------------------------------- */
|
|
|
c83c6d |
+
|
|
|
c83c6d |
static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via netscape remote */
|
|
|
c83c6d |
{
|
|
|
c83c6d |
char *name = (char *) data;
|
|
|
c83c6d |
@@ -3736,6 +3773,8 @@ static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via
|
|
|
c83c6d |
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
|
|
c83c6d |
}
|
|
|
c83c6d |
|
|
|
c83c6d |
+ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
|
|
c83c6d |
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
|
|
c83c6d |
setuid(getuid());
|
|
|
c83c6d |
@@ -3778,6 +3817,8 @@ static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via
|
|
|
c83c6d |
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
|
|
c83c6d |
}
|
|
|
c83c6d |
|
|
|
c83c6d |
+ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
|
|
c83c6d |
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
|
|
c83c6d |
setuid(getuid());
|
|
|
c83c6d |
@@ -3899,6 +3940,8 @@ static void xsane_show_doc(GtkWidget *widget, gpointer data)
|
|
|
c83c6d |
ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
|
|
|
c83c6d |
}
|
|
|
c83c6d |
|
|
|
c83c6d |
+ xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
|
|
|
c83c6d |
+
|
|
|
c83c6d |
DBG(DBG_info, "trying to change user id for new subprocess:\n");
|
|
|
c83c6d |
DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
|
|
|
c83c6d |
setuid(getuid());
|
|
|
c83c6d |
--
|
|
|
c83c6d |
1.7.11.4
|
|
|
c83c6d |
|