From 57bfe188ece3dc3f668ee9fcd089502339bc4c96 Mon Sep 17 00:00:00 2001 From: "Michael I. Bushnell" Date: Mon, 24 Jun 1996 19:14:30 +0000 Subject: (diskfs_create_node): Validate group change before making it. --- libdiskfs/node-create.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'libdiskfs/node-create.c') diff --git a/libdiskfs/node-create.c b/libdiskfs/node-create.c index b81cbcf3..7b7b089f 100644 --- a/libdiskfs/node-create.c +++ b/libdiskfs/node-create.c @@ -35,6 +35,7 @@ diskfs_create_node (struct node *dir, struct node *np; error_t err; uid_t newuid; + gid_t newgid; if (diskfs_readonly) return EROFS; @@ -49,34 +50,34 @@ diskfs_create_node (struct node *dir, } np = *newnode; + /* Initialize the on-disk fields. */ - if (cred->nuids) - { - err = diskfs_validate_owner_change (np, cred->uids[0]); - if (err) - goto change_err; - np->dn_stat.st_uid = cred->uids[0]; - } + newuid = cred->uids[0]; else { - err = diskfs_validate_owner_change (np, dir->dn_stat.st_uid); - if (err) - goto change_err; - np->dn_stat.st_uid = dir->dn_stat.st_uid; + newuid = dir->dn_stat.st_uid; mode &= ~S_ISUID; } + err = diskfs_validate_owner_change (np, newuid); + if (err) + goto change_err; + np->dn_stat.st_uid = newuid; if (diskfs_groupmember (dir->dn_stat.st_gid, cred)) - np->dn_stat.st_gid = dir->dn_stat.st_gid; + newgid = dir->dn_stat.st_gid; else if (cred->ngids) - np->dn_stat.st_gid = cred->gids[0]; + newgid = cred->gids[0]; else { - np->dn_stat.st_gid = dir->dn_stat.st_gid; + newgid = dir->dn_stat.st_gid; mode &= ~S_ISGID; } - + err = diskfs_validate_group_change (np, newgid); + if (err) + goto change_err; + np->dn_stat.st_gid = newgid; + np->dn_stat.st_rdev = 0; np->dn_stat.st_nlink = !!name; err = diskfs_validate_mode_change (np, mode); -- cgit v1.2.3