diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-10 06:17:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:30 -0500 |
| commit | d084d6d24109ae615af89776519e7ebd722e9a4c (patch) | |
| tree | 7ba3c646b931da0fe6e2c57ee31ade86f8d0f481 | |
| parent | 3f27c9efb97c7656bc34b559efbbe59d8cab40d7 (diff) | |
| download | samba-d084d6d24109ae615af89776519e7ebd722e9a4c.tar.gz samba-d084d6d24109ae615af89776519e7ebd722e9a4c.tar.bz2 samba-d084d6d24109ae615af89776519e7ebd722e9a4c.zip | |
r8279: make sure we hold a lock when manipulating the irpc names db
(This used to be commit 9c408d5d7cb82e910ffb5963ddc78e5759513385)
| -rw-r--r-- | source4/lib/messaging/messaging.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 8345c79c77..5afcf91bab 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -728,11 +728,16 @@ NTSTATUS irpc_add_name(struct messaging_context *msg_ctx, const char *name) t = irpc_namedb_open(msg_ctx); NT_STATUS_HAVE_NO_MEMORY(t); + if (tdb_lock_bystring(t->tdb, name) != 0) { + talloc_free(t); + return NT_STATUS_LOCK_NOT_GRANTED; + } rec = tdb_fetch_bystring(t->tdb, name); count = rec.dsize / sizeof(uint32_t); rec.dptr = (char *)realloc_p(rec.dptr, uint32_t, count+1); rec.dsize += sizeof(uint32_t); if (rec.dptr == NULL) { + tdb_unlock_bystring(t->tdb, name); talloc_free(t); return NT_STATUS_NO_MEMORY; } @@ -741,6 +746,7 @@ NTSTATUS irpc_add_name(struct messaging_context *msg_ctx, const char *name) status = NT_STATUS_INTERNAL_ERROR; } free(rec.dptr); + tdb_unlock_bystring(t->tdb, name); talloc_free(t); msg_ctx->names = str_list_add(msg_ctx->names, name); @@ -764,21 +770,29 @@ uint32_t *irpc_servers_byname(struct messaging_context *msg_ctx, const char *nam return NULL; } + if (tdb_lock_bystring(t->tdb, name) != 0) { + talloc_free(t); + return NULL; + } rec = tdb_fetch_bystring(t->tdb, name); if (rec.dptr == NULL) { + tdb_unlock_bystring(t->tdb, name); talloc_free(t); return NULL; } count = rec.dsize / sizeof(uint32_t); - ret = talloc_array(msg_ctx, uint32_t, count); + ret = talloc_array(msg_ctx, uint32_t, count+1); if (ret == NULL) { + tdb_unlock_bystring(t->tdb, name); talloc_free(t); return NULL; } for (i=0;i<count;i++) { ret[i] = ((uint32_t *)rec.dptr)[i]; } + ret[i] = 0; free(rec.dptr); + tdb_unlock_bystring(t->tdb, name); talloc_free(t); return ret; @@ -801,9 +815,14 @@ void irpc_remove_name(struct messaging_context *msg_ctx, const char *name) return; } + if (tdb_lock_bystring(t->tdb, name) != 0) { + talloc_free(t); + return; + } rec = tdb_fetch_bystring(t->tdb, name); count = rec.dsize / sizeof(uint32_t); if (count == 0) { + tdb_unlock_bystring(t->tdb, name); talloc_free(t); return; } @@ -819,5 +838,6 @@ void irpc_remove_name(struct messaging_context *msg_ctx, const char *name) } tdb_store_bystring(t->tdb, name, rec, 0); free(rec.dptr); + tdb_unlock_bystring(t->tdb, name); talloc_free(t); } |