diff options
| author | mux <mux@FreeBSD.org> | 2002-09-19 18:54:22 +0000 |
|---|---|---|
| committer | mux <mux@FreeBSD.org> | 2002-09-19 18:54:22 +0000 |
| commit | 50d0cbdd14bc33d20a6c6686e125ea32007f7940 (patch) | |
| tree | 6b62913183274f16ddf1e0e9da315817e5dc27d5 /sys/kern/vfs_mount.c | |
| parent | b2eb3d57ff032ce0f305469f8e75f30f6dd6e467 (diff) | |
| download | FreeBSD-src-50d0cbdd14bc33d20a6c6686e125ea32007f7940.zip FreeBSD-src-50d0cbdd14bc33d20a6c6686e125ea32007f7940.tar.gz | |
Switch to using strlcpy() in several places. It seems there
were cases where we could get unterminated strings before.
Diffstat (limited to 'sys/kern/vfs_mount.c')
| -rw-r--r-- | sys/kern/vfs_mount.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 38b9acd..64e18ae 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -641,11 +641,11 @@ vfs_nmount(td, fsflags, fsoptions) vfsp->vfc_refcount++; mp->mnt_stat.f_type = vfsp->vfc_typenum; mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK; - strncpy(mp->mnt_stat.f_fstypename, fstype, MFSNAMELEN); + strlcpy(mp->mnt_stat.f_fstypename, fstype, MFSNAMELEN); mp->mnt_vnodecovered = vp; mp->mnt_cred = crdup(td->td_ucred); mp->mnt_stat.f_owner = td->td_ucred->cr_uid; - strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); + strlcpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC mac_init_mount(mp); @@ -1009,11 +1009,11 @@ vfs_mount(td, fstype, fspath, fsflags, fsdata) vfsp->vfc_refcount++; mp->mnt_stat.f_type = vfsp->vfc_typenum; mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK; - strncpy(mp->mnt_stat.f_fstypename, fstype, MFSNAMELEN); + strlcpy(mp->mnt_stat.f_fstypename, fstype, MFSNAMELEN); mp->mnt_vnodecovered = vp; mp->mnt_cred = crdup(td->td_ucred); mp->mnt_stat.f_owner = td->td_ucred->cr_uid; - strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); + strlcpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC mac_init_mount(mp); @@ -1378,10 +1378,10 @@ vfs_rootmountalloc(fstypename, devname, mpp) mp->mnt_iosize_max = DFLTPHYS; mp->mnt_stat.f_type = vfsp->vfc_typenum; mp->mnt_flag |= vfsp->vfc_flags & MNT_VISFLAGMASK; - strncpy(mp->mnt_stat.f_fstypename, vfsp->vfc_name, MFSNAMELEN); + strlcpy(mp->mnt_stat.f_fstypename, vfsp->vfc_name, MFSNAMELEN); mp->mnt_stat.f_mntonname[0] = '/'; mp->mnt_stat.f_mntonname[1] = 0; - (void) copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 0); + strlcpy(mp->mnt_stat.f_mntfromname, devname, MNAMELEN); #ifdef MAC mac_init_mount(mp); mac_create_mount(td->td_ucred, mp); @@ -1526,7 +1526,7 @@ vfs_mountroot_try(char *mountfrom) * f_mntonname unless they want to override the default * (which is `path'.) */ - strncpy(mp->mnt_stat.f_mntonname, "/", MNAMELEN); + strlcpy(mp->mnt_stat.f_mntonname, "/", MNAMELEN); error = VFS_MOUNT(mp, NULL, NULL, NULL, curthread); |
