From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:15:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EAA916A469; Thu, 28 Jun 2007 11:15:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 019B916A400 for ; Thu, 28 Jun 2007 11:15:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E591113C45A for ; Thu, 28 Jun 2007 11:15:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SBFPma040404 for ; Thu, 28 Jun 2007 11:15:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SBFPnl040401 for perforce@freebsd.org; Thu, 28 Jun 2007 11:15:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:15:25 GMT Message-Id: <200706281115.l5SBFPnl040401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=122475 Change 122475 by rdivacky@rdivacky_witten on 2007/06/28 11:14:41 Vrele previously vref-ed vnode in a case of failure of the second kern_get_at. Pointed out by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#36 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#36 (text+ko) ==== @@ -951,7 +951,6 @@ int mode; } */ *uap; { - return kern_open(td, uap->path, UIO_USERSPACE, uap->flags, uap->mode); } @@ -1011,7 +1010,7 @@ } else { error = copyin(path, buf, 1); if (error) - return 0; /* we want to fail */ + return 0; /* We want to fail. */ return (buf[0] == '/'); } } @@ -1050,7 +1049,6 @@ goto out; } flags = FFLAGS(flags); - error = falloc(td, &nfp, &indx); if (error) goto out; @@ -1570,12 +1568,12 @@ enum uio_seg segflg, int follow) { struct nameidata ndp, ndl; - int error; struct vnode *pdvp, *ldvp; struct vnode *vp; struct mount *mp; int vfslocked; int lvfslocked; + int error; error = kern_get_at(td, fd1, &pdvp); if (error && !kern_absolute_path(path1, segflg)) @@ -1585,8 +1583,11 @@ AUDITVNODE1, segflg, path1, td, pdvp); error = kern_get_at(td, fd2, &ldvp); - if (error && !kern_absolute_path(path2, segflg)) + if (error && !kern_absolute_path(path2, segflg)) { + if (pdvp) + vrele(pdvp); return (error); + } NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp); @@ -3769,9 +3770,13 @@ error = kern_get_at(td, oldfd, &frdvp); if (error && !kern_absolute_path(old, pathseg)) return (error); + error = kern_get_at(td, newfd, &todvp); - if (error && !kern_absolute_path(new, pathseg)) + if (error && !kern_absolute_path(new, pathseg)) { + if (frdvp) + vrele(frdvp); return (error); + } #ifdef MAC NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT |