summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornatano <natano@openbsd.org>2016-04-26 18:23:07 +0000
committernatano <natano@openbsd.org>2016-04-26 18:23:07 +0000
commitf4eb1db2ff0bf4dd48ff5ab63d396738f7227876 (patch)
treed4ea2839e456830ec3e715cffd0d9f29f48b62ea
parentImplement daemon_rtable support. (diff)
downloadwireguard-openbsd-f4eb1db2ff0bf4dd48ff5ab63d396738f7227876.tar.xz
wireguard-openbsd-f4eb1db2ff0bf4dd48ff5ab63d396738f7227876.zip
copy_statfs_info() is not only used by ufs, but by other filesystems too,
so make sure that all members of mp->mnt_stat.mount_info are copied. ok stefan
-rw-r--r--sys/kern/vfs_subr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index d4579f3dfe0..71b4b7b1982 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.245 2016/04/26 09:51:22 beck Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.246 2016/04/26 18:23:07 natano Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -2276,6 +2276,6 @@ copy_statfs_info(struct statfs *sbp, const struct mount *mp)
memcpy(sbp->f_mntonname, mp->mnt_stat.f_mntonname, MNAMELEN);
memcpy(sbp->f_mntfromname, mp->mnt_stat.f_mntfromname, MNAMELEN);
memcpy(sbp->f_mntfromspec, mp->mnt_stat.f_mntfromspec, MNAMELEN);
- memcpy(&sbp->mount_info.ufs_args, &mp->mnt_stat.mount_info.ufs_args,
- sizeof(struct ufs_args));
+ memcpy(&sbp->mount_info, &mp->mnt_stat.mount_info,
+ sizeof(union mount_info));
}