From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 28 Jul 2020 14:19:30 +0000 (-0400)
Subject: Fix: common: improper use of negative return
X-Git-Tag: v2.13.0-rc1~559
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3545ccee06dde5d357ff4c9811939af1e1c0622e;p=lttng-tools.git

Fix: common: improper use of negative return

From Coverity:

  CID 1431053 (#1 of 2): Improper use of negative value (NEGATIVE_RETURNS)
  5. negative_returns: fd_count is passed to a parameter that cannot be
     negative.

Solution
========

Check return value for fd_count and goto error if negative.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ibdb2f065f0ebe51efae9125630a17730386395ac
---

diff --git a/src/common/unix.c b/src/common/unix.c
index 502002425..205334325 100644
--- a/src/common/unix.c
+++ b/src/common/unix.c
@@ -453,6 +453,11 @@ ssize_t _lttcomm_send_payload_view_fds_unix_sock(int sock,
 
 	lttng_dynamic_array_init(&raw_fds, sizeof(int), NULL);
 
+	if (fd_count < 0) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
 	/*
 	 * Prepare a contiguous array of file descriptors to send them.
 	 *