diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2017-04-19 15:15:56 -0300 | 
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2017-06-05 12:23:18 -0300 | 
| commit | b3121cd7d14f28cad53d39d9fbf09b036d3e95c9 (patch) | |
| tree | 7c50b98430e82582c6d1c3e5be784f7d635cdc00 /ldpd/ldpe.c | |
| parent | e75f810c2f6d3322e981c3e50f7d87f181005461 (diff) | |
ldpd: fix segfault after failed initialization
When ldpd fails to start for some reason, like failing to create a pid
file, the child processes call their shutdown functions without being
completely initialized. This patch adds some protections to prevent a
segmentation fault on such circumstances.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ldpd/ldpe.c')
| -rw-r--r-- | ldpd/ldpe.c | 11 | 
1 files changed, 7 insertions, 4 deletions
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index 1248d4f86e..bd0f9dbd6f 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -196,9 +196,11 @@ ldpe_shutdown(void)  	struct adj		*adj;  	/* close pipes */ -	msgbuf_write(&iev_lde->ibuf.w); -	msgbuf_clear(&iev_lde->ibuf.w); -	close(iev_lde->ibuf.fd); +	if (iev_lde) { +		msgbuf_write(&iev_lde->ibuf.w); +		msgbuf_clear(&iev_lde->ibuf.w); +		close(iev_lde->ibuf.fd); +	}  	msgbuf_write(&iev_main->ibuf.w);  	msgbuf_clear(&iev_main->ibuf.w);  	close(iev_main->ibuf.fd); @@ -226,7 +228,8 @@ ldpe_shutdown(void)  		adj_del(adj, S_SHUTDOWN);  	/* clean up */ -	free(iev_lde); +	if (iev_lde) +		free(iev_lde);  	free(iev_main);  	free(iev_main_sync);  	free(pkt_ptr);  | 
