Thu Oct 28 20:32:45 2010 UTC ()

Zero entire stat structure before filling in contents to avoid
leaking kernel memory -- the elements are no longer packed now that
dev_t is 64bit.

from pgoyette


(pooka)

diff -r1.178 -r1.179 src/sys/kern/vfs_vnops.c

--- src/sys/kern/vfs_vnops.c 2010/09/21 19:26:19	1.178
+++ src/sys/kern/vfs_vnops.c 2010/10/28 20:32:45	1.179

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_vnops.c,v 1.178 2010/09/21 19:26:19 chs Exp $	*/
+/*	$NetBSD: vfs_vnops.c,v 1.179 2010/10/28 20:32:45 pooka Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_vnops.c	8.14 (Berkeley) 6/15/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.178 2010/09/21 19:26:19 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.179 2010/10/28 20:32:45 pooka Exp $");
 #include "veriexec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 @@ -601,26 +601,27 @@ int
 vn_stat(struct vnode *vp, struct stat *sb)
+{
 	struct vattr va;
 	int error;
 	mode_t mode;
 	memset(&va, 0, sizeof(va));
 	error = VOP_GETATTR(vp, &va, kauth_cred_get());
 	if (error)
 		return (error);
 	/*
 	 * Copy from vattr table
 	 */
 	memset(sb, 0, sizeof(*sb));
 	sb->st_dev = va.va_fsid;
 	sb->st_ino = va.va_fileid;
 	mode = va.va_mode;
 	switch (vp->v_type) {
 	case VREG:
 		mode |= S_IFREG;
 		break;
 	case VDIR:
 		mode |= S_IFDIR;
 		break;
 	case VBLK:
 		mode |= S_IFBLK;
 		break;
 @@ -643,27 +644,26 @@ vn_stat(struct vnode *vp, struct stat *s
 	sb->st_nlink = va.va_nlink;
 	sb->st_uid = va.va_uid;
 	sb->st_gid = va.va_gid;
 	sb->st_rdev = va.va_rdev;
 	sb->st_size = va.va_size;
 	sb->st_atimespec = va.va_atime;
 	sb->st_mtimespec = va.va_mtime;
 	sb->st_ctimespec = va.va_ctime;
 	sb->st_birthtimespec = va.va_birthtime;
 	sb->st_blksize = va.va_blocksize;
 	sb->st_flags = va.va_flags;
 	sb->st_gen = 0;
 	sb->st_blocks = va.va_bytes / S_BLKSIZE;
 	memset(sb->st_spare, 0, sizeof(sb->st_spare));
 	return (0);
+}
 /*
  * File table vnode fcntl routine.
  */
 static int
 vn_fcntl(file_t *fp, u_int com, void *data)
+{
 	struct vnode *vp = fp->f_data;
 	int error;
 	error = VOP_FCNTL(vp, com, data, fp->f_flag, kauth_cred_get());