sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

winbindd_cache: don't leak state_path onto talloc tos

Browse Source 
Also check for allocation failures.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
David Disseldorp 2014-11-02 20:21:37 +01:00 committed by Jeremy Allison
parent d428aa65d3
commit 35539826d4
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
source3/winbindd/winbindd_cache.c
View File

@ -3184,6 +3184,8 @@ bool wcache_invalidate_cache_noinit(void)
bool init_wcache(void) bool init_wcache(void)
{ {
char *db_path;
if (wcache == NULL) { if (wcache == NULL) {
wcache = SMB_XMALLOC_P(struct winbind_cache); wcache = SMB_XMALLOC_P(struct winbind_cache);
ZERO_STRUCTP(wcache); ZERO_STRUCTP(wcache);
@ -3192,13 +3194,18 @@ bool init_wcache(void)
if (wcache->tdb != NULL) if (wcache->tdb != NULL)
return true; return true;
db_path = state_path("winbindd_cache.tdb");
if (db_path == NULL) {
return false;
}
/* when working offline we must not clear the cache on restart */ /* when working offline we must not clear the cache on restart */
wcache->tdb = tdb_open_log(state_path("winbindd_cache.tdb"), wcache->tdb = tdb_open_log(db_path,
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_INCOMPATIBLE_HASH | TDB_INCOMPATIBLE_HASH |
(lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)), (lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)),
O_RDWR|O_CREAT, 0600); O_RDWR|O_CREAT, 0600);
TALLOC_FREE(db_path);
if (wcache->tdb == NULL) { if (wcache->tdb == NULL) {
DEBUG(0,("Failed to open winbindd_cache.tdb!\n")); DEBUG(0,("Failed to open winbindd_cache.tdb!\n"));
return false; return false;
@ -3230,6 +3237,8 @@ bool initialize_winbindd_cache(void)
} }
if (cache_bad) { if (cache_bad) {
char *db_path;
DEBUG(0,("initialize_winbindd_cache: clearing cache " DEBUG(0,("initialize_winbindd_cache: clearing cache "
"and re-creating with version number %d\n", "and re-creating with version number %d\n",
WINBINDD_CACHE_VERSION )); WINBINDD_CACHE_VERSION ));
@ -3237,12 +3246,19 @@ bool initialize_winbindd_cache(void)
tdb_close(wcache->tdb); tdb_close(wcache->tdb);
wcache->tdb = NULL; wcache->tdb = NULL;
if (unlink(state_path("winbindd_cache.tdb")) == -1) { db_path = state_path("winbindd_cache.tdb");
DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ", if (db_path == NULL) {
state_path("winbindd_cache.tdb"),
strerror(errno) ));
return false; return false;
} }
if (unlink(db_path) == -1) {
DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
db_path,
strerror(errno) ));
TALLOC_FREE(db_path);
return false;
}
TALLOC_FREE(db_path);
if (!init_wcache()) { if (!init_wcache()) {
DEBUG(0,("initialize_winbindd_cache: re-initialization " DEBUG(0,("initialize_winbindd_cache: re-initialization "
"init_wcache failed.\n")); "init_wcache failed.\n"));
@ -3355,6 +3371,8 @@ static int traverse_fn_cleanup(TDB_CONTEXT *the_tdb, TDB_DATA kbuf,
/* flush the cache */ /* flush the cache */
void wcache_flush_cache(void) void wcache_flush_cache(void)
{ {
char *db_path;
if (!wcache) if (!wcache)
return; return;
if (wcache->tdb) { if (wcache->tdb) {
@ -3365,13 +3383,18 @@ void wcache_flush_cache(void)
return; return;
} }
db_path = state_path("winbindd_cache.tdb");
if (db_path == NULL) {
return;
}
/* when working offline we must not clear the cache on restart */ /* when working offline we must not clear the cache on restart */
wcache->tdb = tdb_open_log(state_path("winbindd_cache.tdb"), wcache->tdb = tdb_open_log(db_path,
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_INCOMPATIBLE_HASH | TDB_INCOMPATIBLE_HASH |
(lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)), (lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST)),
O_RDWR|O_CREAT, 0600); O_RDWR|O_CREAT, 0600);
TALLOC_FREE(db_path);
if (!wcache->tdb) { if (!wcache->tdb) {
DEBUG(0,("Failed to open winbindd_cache.tdb!\n")); DEBUG(0,("Failed to open winbindd_cache.tdb!\n"));
return; return;
@ -4245,7 +4268,7 @@ static bool wbcache_upgrade_v1_to_v2(TDB_CONTEXT *tdb)
int winbindd_validate_cache(void) int winbindd_validate_cache(void)
{ {
int ret = -1; int ret = -1;
const char *tdb_path = state_path("winbindd_cache.tdb"); char *tdb_path = NULL;
TDB_CONTEXT *tdb = NULL; TDB_CONTEXT *tdb = NULL;
uint32_t vers_id; uint32_t vers_id;
bool ok; bool ok;
@ -4253,13 +4276,18 @@ int winbindd_validate_cache(void)
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n")); DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic; smb_panic_fn = validate_panic;
tdb = tdb_open_log(tdb_path, tdb_path = state_path("winbindd_cache.tdb");
if (tdb_path == NULL) {
goto done;
}
tdb = tdb_open_log(tdb_path,
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_INCOMPATIBLE_HASH | TDB_INCOMPATIBLE_HASH |
( lp_winbind_offline_logon() ( lp_winbind_offline_logon()
? TDB_DEFAULT ? TDB_DEFAULT
: TDB_DEFAULT | TDB_CLEAR_IF_FIRST ), : TDB_DEFAULT | TDB_CLEAR_IF_FIRST ),
O_RDWR|O_CREAT, O_RDWR|O_CREAT,
0600); 0600);
if (!tdb) { if (!tdb) {
DEBUG(0, ("winbindd_validate_cache: " DEBUG(0, ("winbindd_validate_cache: "
@ -4301,6 +4329,7 @@ int winbindd_validate_cache(void)
} }
done: done:
TALLOC_FREE(tdb_path);
DEBUG(10, ("winbindd_validate_cache: restoring panic function\n")); DEBUG(10, ("winbindd_validate_cache: restoring panic function\n"));
smb_panic_fn = smb_panic; smb_panic_fn = smb_panic;
return ret; return ret;
@ -4313,11 +4342,15 @@ done:
int winbindd_validate_cache_nobackup(void) int winbindd_validate_cache_nobackup(void)
{ {
int ret = -1; int ret = -1;
const char *tdb_path = state_path("winbindd_cache.tdb"); char *tdb_path;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n")); DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic; smb_panic_fn = validate_panic;
tdb_path = state_path("winbindd_cache.tdb");
if (tdb_path == NULL) {
goto err_panic_restore;
}
if (wcache == NULL || wcache->tdb == NULL) { if (wcache == NULL || wcache->tdb == NULL) {
ret = tdb_validate_open(tdb_path, cache_traverse_validate_fn); ret = tdb_validate_open(tdb_path, cache_traverse_validate_fn);
@ -4330,6 +4363,8 @@ int winbindd_validate_cache_nobackup(void)
"successful.\n")); "successful.\n"));
} }
TALLOC_FREE(tdb_path);
err_panic_restore:
DEBUG(10, ("winbindd_validate_cache_nobackup: restoring panic " DEBUG(10, ("winbindd_validate_cache_nobackup: restoring panic "
"function\n")); "function\n"));
smb_panic_fn = smb_panic; smb_panic_fn = smb_panic;