From owner-svn-ports-all@freebsd.org  Mon Sep  5 17:09:19 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B46DB96A85;
 Mon,  5 Sep 2016 17:09:19 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5EEFC2E6;
 Mon,  5 Sep 2016 17:09:19 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u85H9IL9083738;
 Mon, 5 Sep 2016 17:09:18 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u85H9IH2083736;
 Mon, 5 Sep 2016 17:09:18 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201609051709.u85H9IH2083736@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 5 Sep 2016 17:09:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421378 - in head/security/xinetd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Sep 2016 17:09:19 -0000

Author: garga
Date: Mon Sep  5 17:09:18 2016
New Revision: 421378
URL: https://svnweb.freebsd.org/changeset/ports/421378

Log:
  Fix some edge cases in xinetd file descriptor handling
  
  This change fixes the case where the listening file descriptor is in 0~2
  range (easily reprodutible with a single UDP service)
  
  PR:		211038
  Obtained from:	pfSense
  MFH:		2016Q3
  Sponsored by:	Rubicon Communications (Netgate)

Added:
  head/security/xinetd/files/patch-xinetd_child.c   (contents, props changed)
Modified:
  head/security/xinetd/Makefile

Modified: head/security/xinetd/Makefile
==============================================================================
--- head/security/xinetd/Makefile	Mon Sep  5 16:11:23 2016	(r421377)
+++ head/security/xinetd/Makefile	Mon Sep  5 17:09:18 2016	(r421378)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xinetd
 PORTVERSION=	2.3.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	GENTOO
 

Added: head/security/xinetd/files/patch-xinetd_child.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xinetd/files/patch-xinetd_child.c	Mon Sep  5 17:09:18 2016	(r421378)
@@ -0,0 +1,24 @@
+--- xinetd/child.c.orig	2016-07-13 19:00:31 UTC
++++ xinetd/child.c
+@@ -168,7 +168,8 @@ void exec_server( const struct server *s
+    }
+ #endif
+ 
+-   (void) Sclose( descriptor ) ;
++   if ( descriptor > MAX_PASS_FD )
++      (void) Sclose( descriptor ) ;
+ 
+ #ifndef solaris
+ #if !defined(HAVE_SETSID)
+@@ -321,11 +322,6 @@ void child_process( struct server *serp 
+    signals_pending[0] = -1;
+    signals_pending[1] = -1;
+ 
+-   Sclose(0);
+-   Sclose(1);
+-   Sclose(2);
+-
+-
+ #ifdef DEBUG_SERVER
+    if ( debug.on )
+    {