svn commit: r234944 - head/sys/fs/unionfs

Daichi GOTO daichi at FreeBSD.org
Thu May 3 07:22:30 UTC 2012


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 at 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);


More information about the svn-src-all mailing list