diff options
| author | kib <kib@FreeBSD.org> | 2014-07-28 00:57:28 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-07-28 00:57:28 +0000 |
| commit | e0e54a97de3dedd0cc276b37878c7e6588f721bf (patch) | |
| tree | 1032f3ad20dbfb90ca4959bfd94539f689e94425 | |
| parent | 49b4c6d03e4d643a1b50041ded7d073bc9ebbaf1 (diff) | |
| download | FreeBSD-src-e0e54a97de3dedd0cc276b37878c7e6588f721bf.zip FreeBSD-src-e0e54a97de3dedd0cc276b37878c7e6588f721bf.tar.gz | |
MFC r268607:
In kern_linkat(), avoid passing doomed vnode to the VOP.
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index a5ef59d..80a41d2 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1555,6 +1555,7 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2, bwillwrite(); NDINIT_AT(&nd, LOOKUP, follow | AUDITVNODE1, segflg, path1, fd1, td); +again: if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -1577,8 +1578,7 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2, vput(nd.ni_dvp); vrele(nd.ni_vp); error = EEXIST; - } else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY)) - == 0) { + } else if ((error = vn_lock(vp, LK_EXCLUSIVE)) == 0) { error = can_hardlink(vp, td->td_ucred); if (error == 0) #ifdef MAC @@ -1589,6 +1589,12 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2, error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd); VOP_UNLOCK(vp, 0); vput(nd.ni_dvp); + } else { + vput(nd.ni_dvp); + NDFREE(&nd, NDF_ONLY_PNBUF); + vrele(vp); + vn_finished_write(mp); + goto again; } NDFREE(&nd, NDF_ONLY_PNBUF); } |
