diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-10-29 14:56:10 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-01-09 14:39:23 +1100 |
| commit | 4a6fa39ff96e10b1f36b0656ca27ea74f20ff110 (patch) | |
| tree | 58c489a5632be6bb2f3a15c810f0dbeef79b5f86 /ctdb/server/ctdb_monitor.c | |
| parent | 30299c387f3c9695afb716b3787035cf7c441333 (diff) | |
| download | samba-4a6fa39ff96e10b1f36b0656ca27ea74f20ff110.tar.gz | |
daemon: Protect against double free of callback state while shutting down
When CTDB is shut down and monitoring has been stopped, monitor_context
gets freed and all the callback states hanging off it. This includes
callback state for current_monitor, if the current monitor event has
not yet finished. As a result, when the shutdown event is called,
current_monitor->callback state is not NULL, but it's actually freed
and it's a dangling reference.
So before executing callback function and freeing callback state check
if ctdb->monitor->monitor_context is not NULL.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 7d8546ee4353851f0543d0ca2c4c67cb0cc75aea)
Diffstat (limited to 'ctdb/server/ctdb_monitor.c')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index bc21e5bb1da..984f947a3b4 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -506,3 +506,10 @@ int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb) return ctdb->monitor->monitoring_mode; } +/* + * Check if monitoring has been stopped + */ +bool ctdb_stopped_monitoring(struct ctdb_context *ctdb) +{ + return (ctdb->monitor->monitor_context == NULL ? true : false); +} |