svn commit: r197151 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Pawel Jakub Dawidek pjd at FreeBSD.org
Sun Sep 13 10:25:33 UTC 2009


Author: pjd
Date: Sun Sep 13 10:25:33 2009
New Revision: 197151
URL: http://svn.freebsd.org/changeset/base/197151

Log:
  Be sure not to overflow struct fid.
  
  MFC after:	3 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Sun Sep 13 10:12:29 2009	(r197150)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Sun Sep 13 10:25:33 2009	(r197151)
@@ -1149,6 +1149,8 @@ zfs_checkexp(vfs_t *vfsp, struct sockadd
 	    credanonp, numsecflavors, secflavors));
 }
 
+CTASSERT(SHORT_FID_LEN <= sizeof(struct fid));
+CTASSERT(LONG_FID_LEN <= sizeof(struct fid));
 
 static int
 zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp)


More information about the svn-src-all mailing list