From owner-p4-projects@FreeBSD.ORG Sun Jun 3 12:23:07 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9CC7616A469; Sun, 3 Jun 2007 12:23:07 +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 48D3316A421
for <perforce@FreeBSD.org>; Sun, 3 Jun 2007 12:23:07 +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 39A8D13C4AD
for <perforce@FreeBSD.org>; Sun, 3 Jun 2007 12:23:07 +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 l53CN7nA006962
for <perforce@FreeBSD.org>; Sun, 3 Jun 2007 12:23:07 GMT
(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53CN7s0006956
for perforce@freebsd.org; Sun, 3 Jun 2007 12:23:07 GMT
(envelope-from rdivacky@FreeBSD.org)
Date: Sun, 3 Jun 2007 12:23:07 GMT
Message-Id: <200706031223.l53CN7s0006956@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 120836 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2007 12:23:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=120836
Change 120836 by rdivacky@rdivacky_witten on 2007/06/03 12:22:56
Switch lstat and stat in linux_fstatat64().
Call namei() to prevent panic.
Lock the leaf node in stat syscalls.
Affected files ...
.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#7 edit
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#10 edit
Differences ...
==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#7 (text+ko) ====
@@ -621,9 +621,9 @@
dfd = args->dfd;
if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW)
+ error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd);
+ else
error = kern_statat(td, path, UIO_SYSSPACE, &buf, dfd);
- else
- error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd);
translate_path_major_minor_at(td, args->pathname, &buf, dfd);
if (!error)
==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#10 (text+ko) ====
@@ -2134,13 +2134,10 @@
kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp)
{
struct nameidata nd;
- int error;
NDINIT(&nd, LOOKUP,
FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1,
pathseg, path, td);
- if ((error = namei(&nd)) != 0)
- return (error);
return kern_common_stat(td, sbp, &nd);
}
@@ -2164,7 +2161,8 @@
}
}
- NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 |
+ MPSAFE, pathseg, path, td, dir_vn);
error = kern_common_stat(td, sbp, &nd);
if (dirfd != AT_FDCWD)
@@ -2178,6 +2176,8 @@
struct stat sb;
int error, vfslocked;
+ if ((error = namei(nd)) != 0)
+ return (error);
vfslocked = NDHASGIANT(nd);
error = vn_stat(nd->ni_vp, &sb, td->td_ucred, NOCRED, td);
NDFREE(nd, NDF_ONLY_PNBUF);
@@ -2221,13 +2221,10 @@
kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp)
{
struct nameidata nd;
- int error;
NDINIT(&nd, LOOKUP,
NOFOLLOW | LOCKLEAF | LOCKSHARED | MPSAFE | AUDITVNODE1,
pathseg, path, td);
- if ((error = namei(&nd)) != 0)
- return (error);
return kern_common_lstat(td, sbp, &nd);
}
@@ -2251,9 +2248,10 @@
}
}
- NDINIT_AT(&nd, LOOKUP, NOFOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 |
+ MPSAFE, pathseg, path, td, dir_vn);
- error = kern_common_stat(td, sbp, &nd);
+ error = kern_common_lstat(td, sbp, &nd);
if (dirfd != AT_FDCWD)
vrele(dir_vn);
return (error);
@@ -2266,6 +2264,8 @@
struct stat sb;
int error, vfslocked;
+ if ((error = namei(nd)) != 0)
+ return (error);
vfslocked = NDHASGIANT(nd);
vp = nd->ni_vp;
error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td);