Fix 'putting +: in /etc/group causes many programs to dump core' bug
by heading off possible null pointer dereferences in grscan(). Also change getgrnam() slightly to properly handle the change: if grscan() returns an rval of 1 and leaves a '+' in the gr_name field and YP is enabled, poll the YP group.byname map before giving up. This should insure that we make every effort to find a match in the local and YP group databases before bailing out.
This commit is contained in:
parent
e831146aee
commit
89047c9c7c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=7124
@ -93,7 +93,8 @@ getgrnam(name)
|
||||
return(NULL);
|
||||
rval = grscan(1, 0, name);
|
||||
#ifdef YP
|
||||
if(!rval && _gr_yp_enabled < 0) {
|
||||
if(!rval && (_gr_yp_enabled < 0 || (_gr_yp_enabled &&
|
||||
_gr_group.gr_name[0] == '+'))) {
|
||||
rval = _getypgroup(&_gr_group, name, "group.byname");
|
||||
}
|
||||
#endif
|
||||
@ -229,6 +230,15 @@ grscan(search, gid, name)
|
||||
continue;
|
||||
}
|
||||
}
|
||||
#ifdef YP
|
||||
/*
|
||||
* XXX We need to be careful to avoid proceeding
|
||||
* past this point under certain circumstances or
|
||||
* we risk dereferencing null pointers down below.
|
||||
*/
|
||||
if (!search && _gr_group.gr_name[0] == '+')
|
||||
return(1);
|
||||
#endif /* YP */
|
||||
_gr_group.gr_passwd = strsep(&bp, ":\n");
|
||||
if (!(cp = strsep(&bp, ":\n")))
|
||||
continue;
|
||||
|
Loading…
Reference in New Issue
Block a user