isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a potential crash when getpwnam() of the running user fails

Browse Source 
and we don't replace the negative cached entry with a faked up one.
From Stephane Chazelas
This commit is contained in:
Todd C. Miller
2015-02-05 11:17:26 -07:00
parent 67eba7e534
commit cebd92a88e
1 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
plugins/sudoers/pwutil.c
View File

@@ -211,8 +211,8 @@ sudo_mkpwent(const char *user, uid_t uid, gid_t gid, const char *home,
const char *shell) const char *shell)
{ {
struct cache_item_pw *pwitem; struct cache_item_pw *pwitem;
struct cache_item *item;
struct passwd *pw; struct passwd *pw;
struct rbnode *node;
size_t len, name_len, home_len, shell_len; size_t len, name_len, home_len, shell_len;
int i; int i;
debug_decl(sudo_mkpwent, SUDOERS_DEBUG_NSS) debug_decl(sudo_mkpwent, SUDOERS_DEBUG_NSS)
@@ -231,6 +231,9 @@ sudo_mkpwent(const char *user, uid_t uid, gid_t gid, const char *home,
home_len + 1 /* pw_dir */ + shell_len + 1 /* pw_shell */; home_len + 1 /* pw_dir */ + shell_len + 1 /* pw_shell */;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
struct rbtree *pwcache;
struct rbnode *node;
pwitem = sudo_ecalloc(1, len); pwitem = sudo_ecalloc(1, len);
pw = &pwitem->pw; pw = &pwitem->pw;
pw->pw_uid = uid; pw->pw_uid = uid;
@@ -246,28 +249,33 @@ sudo_mkpwent(const char *user, uid_t uid, gid_t gid, const char *home,
pw->pw_shell = pw->pw_dir + home_len + 1; pw->pw_shell = pw->pw_dir + home_len + 1;
memcpy(pw->pw_shell, shell, shell_len + 1); memcpy(pw->pw_shell, shell, shell_len + 1);
pwitem->cache.refcnt = 1; item = &pwitem->cache;
pwitem->cache.d.pw = pw; item->refcnt = 1;
item->d.pw = pw;
if (i == 0) { if (i == 0) {
/* Store by uid if it doesn't already exist. */ /* Store by uid if it doesn't already exist. */
pwitem->cache.k.uid = pw->pw_uid; item->k.uid = pw->pw_uid;
if ((node = rbinsert(pwcache_byuid, &pwitem->cache)) != NULL) { pwcache = pwcache_byuid;
/* Already exists, free the item we created. */
sudo_efree(pwitem);
pwitem = (struct cache_item_pw *) node->data;
}
} else { } else {
/* Store by name if it doesn't already exist. */ /* Store by name if it doesn't already exist. */
pwitem->cache.k.name = pw->pw_name; item->k.name = pw->pw_name;
if ((node = rbinsert(pwcache_byname, &pwitem->cache)) != NULL) { pwcache = pwcache_byname;
/* Already exists, free the item we created. */ }
if ((node = rbinsert(pwcache, item)) != NULL) {
/* Already exists. */
item = (struct cache_item *) node->data;
if (item->d.pw == NULL) {
/* Negative cache entry, replace with ours. */
sudo_pw_delref_item(item);
item = node->data = &pwitem->cache;
} else {
/* Good entry, discard our fake one. */
sudo_efree(pwitem); sudo_efree(pwitem);
pwitem = (struct cache_item_pw *) node->data;
} }
} }
} }
pwitem->cache.refcnt++; item->refcnt++;
debug_return_ptr(&pwitem->pw); debug_return_ptr(item->d.pw);
} }
/* /*
@@ -451,9 +459,9 @@ struct group *
sudo_fakegrnam(const char *group) sudo_fakegrnam(const char *group)
{ {
struct cache_item_gr *gritem; struct cache_item_gr *gritem;
struct cache_item *item;
const char *errstr; const char *errstr;
struct group *gr; struct group *gr;
struct rbnode *node;
size_t len, name_len; size_t len, name_len;
int i; int i;
debug_decl(sudo_fakegrnam, SUDOERS_DEBUG_NSS) debug_decl(sudo_fakegrnam, SUDOERS_DEBUG_NSS)
@@ -462,6 +470,9 @@ sudo_fakegrnam(const char *group)
len = sizeof(*gritem) + name_len + 1; len = sizeof(*gritem) + name_len + 1;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
struct rbtree *grcache;
struct rbnode *node;
gritem = sudo_ecalloc(1, len); gritem = sudo_ecalloc(1, len);
gr = &gritem->gr; gr = &gritem->gr;
gr->gr_gid = (gid_t) sudo_strtoid(group + 1, NULL, NULL, &errstr); gr->gr_gid = (gid_t) sudo_strtoid(group + 1, NULL, NULL, &errstr);
@@ -474,28 +485,33 @@ sudo_fakegrnam(const char *group)
debug_return_ptr(NULL); debug_return_ptr(NULL);
} }
gritem->cache.refcnt = 1; item = &gritem->cache;
gritem->cache.d.gr = gr; item->refcnt = 1;
item->d.gr = gr;
if (i == 0) { if (i == 0) {
/* Store by gid if it doesn't already exist. */ /* Store by gid if it doesn't already exist. */
gritem->cache.k.gid = gr->gr_gid; item->k.gid = gr->gr_gid;
if ((node = rbinsert(grcache_bygid, &gritem->cache)) != NULL) { grcache = grcache_bygid;
/* Already exists, free the item we created. */
sudo_efree(gritem);
gritem = (struct cache_item_gr *) node->data;
}
} else { } else {
/* Store by name, overwriting cached version. */ /* Store by name, overwriting cached version. */
gritem->cache.k.name = gr->gr_name; gritem->cache.k.name = gr->gr_name;
if ((node = rbinsert(grcache_byname, &gritem->cache)) != NULL) { grcache = grcache_byname;
/* Already exists, free the item we created. */ }
if ((node = rbinsert(grcache, item)) != NULL) {
/* Already exists. */
item = (struct cache_item *) node->data;
if (item->d.gr == NULL) {
/* Negative cache entry, replace with ours. */
sudo_gr_delref_item(item);
item = node->data = &gritem->cache;
} else {
/* Good entry, discard our fake one. */
sudo_efree(gritem); sudo_efree(gritem);
gritem = (struct cache_item_gr *) node->data;
} }
} }
} }
gritem->cache.refcnt++; item->refcnt++;
debug_return_ptr(&gritem->gr); debug_return_ptr(item->d.gr);
} }
void void