Fix: possible double-close on stream out_fd

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index a6306291af17f153a35c56aa300a4bd51c3ed03b..0ac3942d20470b6112351cb11bd908d9b6a44bcf 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -956,11 +956,12 @@ int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
        return 0;
 
 error_close_fd:
        return 0;
 
 error_close_fd:

-       {
+       if (stream->out_fd >= 0) {

                int err;
 
                err = close(stream->out_fd);
                assert(!err);
                int err;
 
                err = close(stream->out_fd);
                assert(!err);

+               stream->out_fd = -1;

        }
 error:
        return ret;
        }
 error:
        return ret;