From owner-svn-src-head@FreeBSD.ORG  Thu May  3 07:22:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EA901065673;
	Thu,  3 May 2012 07:22:30 +0000 (UTC)
	(envelope-from daichi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 08D9C8FC12;
	Thu,  3 May 2012 07:22:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q437MTSe025468;
	Thu, 3 May 2012 07:22:29 GMT (envelope-from daichi@svn.freebsd.org)
Received: (from daichi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q437MTrh025466;
	Thu, 3 May 2012 07:22:29 GMT (envelope-from daichi@svn.freebsd.org)
Message-Id: <201205030722.q437MTrh025466@svn.freebsd.org>
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Thu, 3 May 2012 07:22:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234944 - head/sys/fs/unionfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 May 2012 07:22:30 -0000

Author: daichi
Date: Thu May  3 07:22:29 2012
New Revision: 234944
URL: http://svn.freebsd.org/changeset/base/234944

Log:
  fixed a unionfs_readdir math issue
  
  PR:		132987
  Submitted by:	Matthew Fleming <mfleming@isilon.com>

Modified:
  head/sys/fs/unionfs/union_vnops.c

Modified: head/sys/fs/unionfs/union_vnops.c
==============================================================================
--- head/sys/fs/unionfs/union_vnops.c	Thu May  3 07:17:25 2012	(r234943)
+++ head/sys/fs/unionfs/union_vnops.c	Thu May  3 07:22:29 2012	(r234944)
@@ -1642,7 +1642,7 @@ unionfs_readdir(struct vop_readdir_args 
 		pos = newcookies;
 
 		memcpy(pos, cookies_bk, ncookies_bk * sizeof(u_long));
-		pos += ncookies_bk * sizeof(u_long);
+		pos += ncookies_bk;
 		memcpy(pos, *(ap->a_cookies), *(ap->a_ncookies) * sizeof(u_long));
 		free(cookies_bk, M_TEMP);
 		free(*(ap->a_cookies), M_TEMP);