epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

osdGetRoles() avoid fault when gid==0

Browse Source 
Attempt to detect misbehaving getgrouplist()
fails when user is actually a member of
group 0 (aka. root).

Instead, fill with (gid_t)-1 which seems less likely
to cause problems if erroneously grant.
This commit is contained in:
Michael Davidsaver
2019-09-12 09:32:57 -07:00
parent 24e83daaba
commit b24afb9d33
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/getgroups.cpp
View File

@@ -76,7 +76,7 @@ void osdGetRoles(const std::string& account, PeerInfo::roles_t& roles)
*/
{
// start with a guess
std::vector<osi_gid_t> gtemp(16);
std::vector<osi_gid_t> gtemp(16, (osi_gid_t)-1);
while(true) {
int gcount = int(gtemp.size());
@@ -95,11 +95,11 @@ void osdGetRoles(const std::string& account, PeerInfo::roles_t& roles)
} else if(gcount == int(gtemp.size())) {
// too small, but gcount not updated. (Mac)
// arbitrary increase to size and retry
gtemp.resize(gtemp.size()*2u);
gtemp.resize(gtemp.size()*2u, (osi_gid_t)-1);
} else if(gcount > int(gtemp.size())) {
// too small, gcount holds actual size. retry
gtemp.resize(gcount);
gtemp.resize(gcount, (osi_gid_t)-1);
} else {
// too small, but gcount got smaller? give up
@@ -114,8 +114,6 @@ void osdGetRoles(const std::string& account, PeerInfo::roles_t& roles)
// map GIDs to names
for(gids_t::iterator it(gids.begin()), end(gids.end()); it!=end; it++) {
assert((*it)!=0); // 0 indicates a logic error above
group* gr = getgrgid(*it);
if(!gr)
continue;