mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Acquire Giant explicitly in quotactl() so that the syscalls.master

Browse Source 
entry can become MSTD.
This commit is contained in:
Robert Watson 2005-05-28 13:11:35 +00:00
parent a72baeca1d
commit f8e5f64207
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146715
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/vfs_extattr.c
View File

@ -164,6 +164,8 @@ SYSCTL_INT(_kern_prison, OID_AUTO, quotas, CTLFLAG_RW, &prison_quotas, 0, "");
/*
* Change filesystem quotas.
*
* MP SAFE
*/
#ifndef _SYS_SYSPROTO_H_
struct quotactl_args {
@ -189,17 +191,23 @@ quotactl(td, uap)
if (jailed(td->td_ucred) && !prison_quotas)
return (EPERM);
mtx_lock(&Giant);
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
if ((error = namei(&nd)) != 0)
if ((error = namei(&nd)) != 0) {
mtx_unlock(&Giant);
return (error);
}
NDFREE(&nd, NDF_ONLY_PNBUF);
error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH);
mp = nd.ni_vp->v_mount;
vrele(nd.ni_vp);
if (error)
if (error) {
mtx_unlock(&Giant);
return (error);
}
error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td);
vn_finished_write(vmp);
mtx_unlock(&Giant);
return (error);
}

12
sys/kern/vfs_syscalls.c
View File

@ -164,6 +164,8 @@ SYSCTL_INT(_kern_prison, OID_AUTO, quotas, CTLFLAG_RW, &prison_quotas, 0, "");
/*
* Change filesystem quotas.
*
* MP SAFE
*/
#ifndef _SYS_SYSPROTO_H_
struct quotactl_args {
@ -189,17 +191,23 @@ quotactl(td, uap)
if (jailed(td->td_ucred) && !prison_quotas)
return (EPERM);
mtx_lock(&Giant);
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td);
if ((error = namei(&nd)) != 0)
if ((error = namei(&nd)) != 0) {
mtx_unlock(&Giant);
return (error);
}
NDFREE(&nd, NDF_ONLY_PNBUF);
error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH);
mp = nd.ni_vp->v_mount;
vrele(nd.ni_vp);
if (error)
if (error) {
mtx_unlock(&Giant);
return (error);
}
error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td);
vn_finished_write(vmp);
mtx_unlock(&Giant);
return (error);
}