From patchwork Wed Mar 21 10:52:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: mark newly opened fds as FD_CLOEXEC (close on exec) [part 2] From: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 147962 Message-Id: <1332327120-22444-1-git-send-email-zenczykowski@gmail.com> To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Cc: netfilter-devel@vger.kernel.org Date: Wed, 21 Mar 2012 03:52:00 -0700 From: Maciej Żenczykowski This is iptables-1.4.11-cloexec.patch from Fedora 18 iptables source rpm, in particular: http://kojipkgs.fedoraproject.org/packages/iptables/1.4.12.2/4.fc18/src/iptables-1.4.12.2-4.fc18.src.rpm Signed-off-by: Maciej Żenczykowski --- extensions/libxt_set.h | 7 +++++++ libiptc/libiptc.c | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/extensions/libxt_set.h b/extensions/libxt_set.h index 4ac84fa9c022..47c3f5b6f5d4 100644 --- a/extensions/libxt_set.h +++ b/extensions/libxt_set.h @@ -2,6 +2,7 @@ #define _LIBXT_SET_H #include +#include #include #include #include @@ -23,6 +24,12 @@ get_version(unsigned *version) xtables_error(OTHER_PROBLEM, "Can't open socket to ipset.\n"); + if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) { + xtables_error(OTHER_PROBLEM, + "Could not set close on exec: %s\n", + strerror(errno)); + } + req_version.op = IP_SET_OP_VERSION; res = getsockopt(sockfd, SOL_IP, SO_IP_SET, &req_version, &size); if (res != 0) diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index 13e41d525f28..63965e738596 100644 --- a/libiptc/libiptc.c +++ b/libiptc/libiptc.c @@ -29,6 +29,8 @@ * - performance work: speedup initial ruleset parsing. * - sponsored by ComX Networks A/S (http://www.comx.dk/) */ +#include +#include #include #include #include @@ -1316,6 +1318,12 @@ TC_INIT(const char *tablename) if (sockfd < 0) return NULL; + if (fcntl(sockfd, F_SETFD, FD_CLOEXEC) == -1) { + fprintf(stderr, "Could not set close on exec: %s\n", + strerror(errno)); + abort(); + } + retry: s = sizeof(info);