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

Sync the "cache hit" debug messages with the "cached" debug messages.

Browse Source 
This fixes a bug where we could dereference a NULL pointer when we
look up a negative cached entry which is stored as a NULL passwd
or group struct pointer.  Bug #743.
This commit is contained in:
Todd C. Miller
2016-05-04 08:55:21 -06:00
parent 9d5c6fbd64
commit a152afaeb5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sudoers/pwutil.c
View File

@@ -139,8 +139,8 @@ sudo_getpwuid(uid_t uid)
item = node->data;
sudo_debug_printf(SUDO_DEBUG_DEBUG,
"%s: uid %u [%s] -> user %s [%s] (cache hit)", __func__,
(unsigned int)uid, key.registry, item->d.pw->pw_name,
item->registry);
(unsigned int)uid, key.registry,
item->d.pw ? item->d.pw->pw_name : "unknown", item->registry);
goto done;
}
/*
@@ -202,8 +202,8 @@ sudo_getpwnam(const char *name)
if ((node = rbfind(pwcache_byname, &key)) != NULL) {
item = node->data;
sudo_debug_printf(SUDO_DEBUG_DEBUG,
"%s: user %s [%s] -> uid %u [%s] (cache hit)", __func__, name,
key.registry, (unsigned int)item->d.pw->pw_uid, item->registry);
"%s: user %s [%s] -> uid %d [%s] (cache hit)", __func__, name,
key.registry, item->d.pw ? (int)item->d.pw->pw_uid : -1, item->registry);
goto done;
}
/*
@@ -461,8 +461,8 @@ sudo_getgrgid(gid_t gid)
item = node->data;
sudo_debug_printf(SUDO_DEBUG_DEBUG,
"%s: gid %u [%s] -> group %s [%s] (cache hit)", __func__,
(unsigned int)gid, key.registry, item->d.gr->gr_name,
item->registry);
(unsigned int)gid, key.registry,
item->d.gr ? item->d.gr->gr_name : "unknown", item->registry);
goto done;
}
/*