d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent quotactl calls that pass in an id of -1 from incorrectly

Browse Source 
using the callers UID instead of the GID when performing group
operations.  This could allow users to determine group quota
information for groups they are not a member of in some cases.

Rename the "uid" parameter in ufs_quotactl to "id" to better show
that it is used for more than just the uid, and to be more in line
with the naming conventions in the other quota routines.

PR:	kern/33940
This commit is contained in:
mpp 2007-02-01 02:13:53 +00:00
parent 3cdb06d461
commit 261dbc8078
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/ufs/ufs/ufs_vfsops.c
View File

@ -86,10 +86,10 @@ ufs_root(mp, flags, vpp, td)
* Do operations associated with quotas
*/
int
ufs_quotactl(mp, cmds, uid, arg, td)
ufs_quotactl(mp, cmds, id, arg, td)
struct mount *mp;
int cmds;
uid_t uid;
uid_t id;
void *arg;
struct thread *td;
{
@ -98,10 +98,23 @@ ufs_quotactl(mp, cmds, uid, arg, td)
#else
int cmd, type, error;
if (uid == -1)
uid = td->td_ucred->cr_ruid;
cmd = cmds >> SUBCMDSHIFT;
type = cmds & SUBCMDMASK;
if (id == -1) {
switch (type) {
case USRQUOTA:
id = td->td_ucred->cr_ruid;
break;
case GRPQUOTA:
id = td->td_ucred->cr_rgid;
break;
default:
return (EINVAL);
}
}
if ((u_int)type >= MAXQUOTAS)
return (EINVAL);
@ -118,15 +131,15 @@ ufs_quotactl(mp, cmds, uid, arg, td)
break;
case Q_SETQUOTA:
error = setquota(td, mp, uid, type, arg);
error = setquota(td, mp, id, type, arg);
break;
case Q_SETUSE:
error = setuse(td, mp, uid, type, arg);
error = setuse(td, mp, id, type, arg);
break;
case Q_GETQUOTA:
error = getquota(td, mp, uid, type, arg);
error = getquota(td, mp, id, type, arg);
break;
case Q_SYNC: