diff options
| author | Ian Kent <raven@themaw.net> | 2023-10-18 18:48:37 +0800 |
|---|---|---|
| committer | Ian Kent <raven@themaw.net> | 2023-11-02 08:33:11 +0800 |
| commit | b8f436bfaf618cf6476e040dc3031ae47625035a (patch) | |
| tree | 6fbb08cd9928d362719791a1c4a8d507161d0b13 | |
| parent | 59bdbcff66c40ff8653ef2a00f1236f1f035ad8c (diff) | |
| download | autofs-b8f436bfaf618cf6476e040dc3031ae47625035a.tar.gz | |
autofs-5.1.8 - add null check in master_kill()
Try harder to avoid possibility of invalid accesses in master_kill().
Signed-off-by: Ian Kent <raven@themaw.net>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | daemon/master.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -101,6 +101,7 @@ - always recreate credential cache. - fix ldap_parse_page_control() check. - fix typo in create_cmd_pipe_fifo(). +- add null check in master_kill(). 19/10/2021 autofs-5.1.8 - add xdr_exports(). diff --git a/daemon/master.c b/daemon/master.c index d23954ee..f2c11e90 100644 --- a/daemon/master.c +++ b/daemon/master.c @@ -1951,6 +1951,9 @@ unsigned int master_get_logopt(void) int master_kill(struct master *master) { + if (!master) + return 1; + if (!master_list_empty(master)) return 0; @@ -1960,5 +1963,7 @@ int master_kill(struct master *master) cache_release_null_cache(master); free(master); + master_list = NULL; + return 1; } |