From patchwork Tue Sep 6 12:26:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9316575 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B55E360752 for ; Tue, 6 Sep 2016 12:37:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A536028C56 for ; Tue, 6 Sep 2016 12:37:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A46E28D0B; Tue, 6 Sep 2016 12:37:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2415A28C56 for ; Tue, 6 Sep 2016 12:37:27 +0000 (UTC) Received: from localhost ([::1]:33072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhFd0-0002cl-3W for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 08:37:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhFTH-0002m3-GC for qemu-devel@nongnu.org; Tue, 06 Sep 2016 08:27:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhFT9-0001Ap-UM for qemu-devel@nongnu.org; Tue, 06 Sep 2016 08:27:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhFT9-0001Al-Mw for qemu-devel@nongnu.org; Tue, 06 Sep 2016 08:27:15 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5841980086; Tue, 6 Sep 2016 12:27:15 +0000 (UTC) Received: from localhost (ovpn-116-72.phx2.redhat.com [10.3.116.72]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u86CRD1l019348; Tue, 6 Sep 2016 08:27:14 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2016 16:26:23 +0400 Message-Id: <20160906122639.11163-11-marcandre.lureau@redhat.com> In-Reply-To: <20160906122639.11163-1-marcandre.lureau@redhat.com> References: <20160906122639.11163-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 06 Sep 2016 12:27:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 10/26] tests: fix small leak in test-io-channel-command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP srcfifo && dstfifo must be freed in error case, however unlink() may delete a file from a different context. Instead, use mkdtemp()/rmdir() for the temporary files. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- tests/test-io-channel-command.c | 20 +++++++++++++------- tests/test-qga.c | 3 ++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/test-io-channel-command.c b/tests/test-io-channel-command.c index 1d1f461..f99118e 100644 --- a/tests/test-io-channel-command.c +++ b/tests/test-io-channel-command.c @@ -18,6 +18,7 @@ * */ +#include #include "qemu/osdep.h" #include "io/channel-command.h" #include "io-channel-helpers.h" @@ -26,11 +27,14 @@ #ifndef WIN32 static void test_io_channel_command_fifo(bool async) { -#define TEST_FIFO "tests/test-io-channel-command.fifo" QIOChannel *src, *dst; QIOChannelTest *test; - char *srcfifo = g_strdup_printf("PIPE:%s,wronly", TEST_FIFO); - char *dstfifo = g_strdup_printf("PIPE:%s,rdonly", TEST_FIFO); + char *tmpdir = g_strdup("/tmp/test-io-channel.XXXXXX"); + g_assert_nonnull(mkdtemp(tmpdir)); + + char *fifo = g_strdup_printf("%s/command.fifo", tmpdir); + char *srcfifo = g_strdup_printf("PIPE:%s,wronly", fifo); + char *dstfifo = g_strdup_printf("PIPE:%s,rdonly", fifo); const char *srcargv[] = { "/bin/socat", "-", srcfifo, NULL, }; @@ -38,11 +42,10 @@ static void test_io_channel_command_fifo(bool async) "/bin/socat", dstfifo, "-", NULL, }; - unlink(TEST_FIFO); if (access("/bin/socat", X_OK) < 0) { - return; /* Pretend success if socat is not present */ + goto end; /* Pretend success if socat is not present */ } - if (mkfifo(TEST_FIFO, 0600) < 0) { + if (mkfifo(fifo, 0600) < 0) { abort(); } src = QIO_CHANNEL(qio_channel_command_new_spawn(srcargv, @@ -59,9 +62,12 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); +end: + g_free(fifo); g_free(srcfifo); g_free(dstfifo); - unlink(TEST_FIFO); + g_rmdir(tmpdir); + g_free(tmpdir); } diff --git a/tests/test-qga.c b/tests/test-qga.c index 21f44f8..0d1acef 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -55,7 +55,8 @@ fixture_setup(TestFixture *fixture, gconstpointer data) fixture->loop = g_main_loop_new(NULL, FALSE); fixture->test_dir = g_strdup("/tmp/qgatest.XXXXXX"); - g_assert_nonnull(mkdtemp(fixture->test_dir)); + path = mkdtemp(fixture->test_dir); + g_assert_nonnull(path); path = g_build_filename(fixture->test_dir, "sock", NULL); cwd = g_get_current_dir();