From owner-svn-src-all@FreeBSD.ORG  Tue Jul  2 07:36:05 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0F9F0ECF;
 Tue,  2 Jul 2013 07:36:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 03BC91AFF;
 Tue,  2 Jul 2013 07:36:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r627a4jZ041733;
 Tue, 2 Jul 2013 07:36:04 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r627a4x6041732;
 Tue, 2 Jul 2013 07:36:04 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201307020736.r627a4x6041732@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Tue, 2 Jul 2013 07:36:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252502 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jul 2013 07:36:05 -0000

Author: mjg
Date: Tue Jul  2 07:36:04 2013
New Revision: 252502
URL: http://svnweb.freebsd.org/changeset/base/252502

Log:
  Fix receiving fd over unix socket broken in r247740.
  
  If n fds were passed, it would receive the first one n times.
  
  Reported by:	Shawn Webb <lattera@gmail.com>, koobs, gleb
  Tested by:	koobs, gleb
  Reviewed by:	pjd

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Tue Jul  2 07:35:57 2013	(r252501)
+++ head/sys/kern/uipc_usrreq.c	Tue Jul  2 07:36:04 2013	(r252502)
@@ -1764,8 +1764,8 @@ unp_externalize(struct mbuf *control, st
 			}
 			for (i = 0; i < newfds; i++, fdp++) {
 				fde = &fdesc->fd_ofiles[*fdp];
-				fde->fde_file = fdep[0]->fde_file;
-				filecaps_move(&fdep[0]->fde_caps,
+				fde->fde_file = fdep[i]->fde_file;
+				filecaps_move(&fdep[i]->fde_caps,
 				    &fde->fde_caps);
 				if ((flags & MSG_CMSG_CLOEXEC) != 0)
 					fde->fde_flags |= UF_EXCLOSE;