mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-24 12:09:58 +00:00
902f6e14fc
The code wrongly passes the mode to open() only if O_WRONLY is set. Instead, the mode should be passed when O_CREAT is set (or O_TMPFILE on Linux). Fix this by always passing the mode since open() will correctly ignore the mode if it is not needed. Add a testcase which exercises this bug and also change the existing testcase to check that the mode of the created file is correct. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
145 lines
3.7 KiB
C
145 lines
3.7 KiB
C
/*
|
|
* QEMU I/O channel file test
|
|
*
|
|
* Copyright (c) 2015 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "io/channel-file.h"
|
|
#include "io/channel-util.h"
|
|
#include "io-channel-helpers.h"
|
|
#include "qapi/error.h"
|
|
|
|
#define TEST_FILE "tests/test-io-channel-file.txt"
|
|
#define TEST_MASK 0600
|
|
|
|
static void test_io_channel_file_helper(int flags)
|
|
{
|
|
QIOChannel *src, *dst;
|
|
QIOChannelTest *test;
|
|
struct stat st;
|
|
mode_t mask;
|
|
int ret;
|
|
|
|
unlink(TEST_FILE);
|
|
src = QIO_CHANNEL(qio_channel_file_new_path(
|
|
TEST_FILE,
|
|
flags, TEST_MASK,
|
|
&error_abort));
|
|
dst = QIO_CHANNEL(qio_channel_file_new_path(
|
|
TEST_FILE,
|
|
O_RDONLY | O_BINARY, 0,
|
|
&error_abort));
|
|
|
|
test = qio_channel_test_new();
|
|
qio_channel_test_run_writer(test, src);
|
|
qio_channel_test_run_reader(test, dst);
|
|
qio_channel_test_validate(test);
|
|
|
|
/* Check that the requested mode took effect. */
|
|
mask = umask(0);
|
|
umask(mask);
|
|
ret = stat(TEST_FILE, &st);
|
|
g_assert_cmpint(ret, >, -1);
|
|
g_assert_cmpuint(TEST_MASK & ~mask, ==, st.st_mode & 0777);
|
|
|
|
unlink(TEST_FILE);
|
|
object_unref(OBJECT(src));
|
|
object_unref(OBJECT(dst));
|
|
}
|
|
|
|
static void test_io_channel_file(void)
|
|
{
|
|
test_io_channel_file_helper(O_WRONLY | O_CREAT | O_TRUNC | O_BINARY);
|
|
}
|
|
|
|
static void test_io_channel_file_rdwr(void)
|
|
{
|
|
test_io_channel_file_helper(O_RDWR | O_CREAT | O_TRUNC | O_BINARY);
|
|
}
|
|
|
|
static void test_io_channel_fd(void)
|
|
{
|
|
QIOChannel *ioc;
|
|
int fd = -1;
|
|
|
|
fd = open(TEST_FILE, O_CREAT | O_TRUNC | O_WRONLY, 0600);
|
|
g_assert_cmpint(fd, >, -1);
|
|
|
|
ioc = qio_channel_new_fd(fd, &error_abort);
|
|
|
|
g_assert_cmpstr(object_get_typename(OBJECT(ioc)),
|
|
==,
|
|
TYPE_QIO_CHANNEL_FILE);
|
|
|
|
unlink(TEST_FILE);
|
|
object_unref(OBJECT(ioc));
|
|
}
|
|
|
|
|
|
#ifndef _WIN32
|
|
static void test_io_channel_pipe(bool async)
|
|
{
|
|
QIOChannel *src, *dst;
|
|
QIOChannelTest *test;
|
|
int fd[2];
|
|
|
|
if (pipe(fd) < 0) {
|
|
perror("pipe");
|
|
abort();
|
|
}
|
|
|
|
src = QIO_CHANNEL(qio_channel_file_new_fd(fd[1]));
|
|
dst = QIO_CHANNEL(qio_channel_file_new_fd(fd[0]));
|
|
|
|
test = qio_channel_test_new();
|
|
qio_channel_test_run_threads(test, async, src, dst);
|
|
qio_channel_test_validate(test);
|
|
|
|
object_unref(OBJECT(src));
|
|
object_unref(OBJECT(dst));
|
|
}
|
|
|
|
|
|
static void test_io_channel_pipe_async(void)
|
|
{
|
|
test_io_channel_pipe(true);
|
|
}
|
|
|
|
static void test_io_channel_pipe_sync(void)
|
|
{
|
|
test_io_channel_pipe(false);
|
|
}
|
|
#endif /* ! _WIN32 */
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
module_call_init(MODULE_INIT_QOM);
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
g_test_add_func("/io/channel/file", test_io_channel_file);
|
|
g_test_add_func("/io/channel/file/rdwr", test_io_channel_file_rdwr);
|
|
g_test_add_func("/io/channel/file/fd", test_io_channel_fd);
|
|
#ifndef _WIN32
|
|
g_test_add_func("/io/channel/pipe/sync", test_io_channel_pipe_sync);
|
|
g_test_add_func("/io/channel/pipe/async", test_io_channel_pipe_async);
|
|
#endif
|
|
return g_test_run();
|
|
}
|