OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

io: Fix QIOChannelFile when creating and opening read-write 

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>
This commit is contained in:
Ross Lagerwall 2017-11-01 14:25:24 +00:00 committed by Daniel P. Berrangé
parent a46ded1de5
commit 902f6e14fc
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/io/channel-file.h
View File

@ -73,7 +73,7 @@ qio_channel_file_new_fd(int fd);
* qio_channel_file_new_path:
* @path: the file path
* @flags: the open flags (O_RDONLY|O_WRONLY|O_RDWR, etc)
* @mode: the file creation mode if O_WRONLY is set in @flags
* @mode: the file creation mode if O_CREAT is set in @flags
* @errp: pointer to initialized error object
*
* Create a new IO channel object for a file represented

6
io/channel-file.c
View File

@ -50,11 +50,7 @@ qio_channel_file_new_path(const char *path,
ioc = QIO_CHANNEL_FILE(object_new(TYPE_QIO_CHANNEL_FILE));
if (flags & O_WRONLY) {
ioc->fd = open(path, flags, mode);
} else {
ioc->fd = open(path, flags);
}
ioc->fd = open(path, flags, mode);
if (ioc->fd < 0) {
object_unref(OBJECT(ioc));
error_setg_errno(errp, errno,

29
tests/test-io-channel-file.c
View File

@ -24,16 +24,21 @@
#include "io-channel-helpers.h"
#include "qapi/error.h"
static void test_io_channel_file(void)
#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;
#define TEST_FILE "tests/test-io-channel-file.txt"
unlink(TEST_FILE);
src = QIO_CHANNEL(qio_channel_file_new_path(
TEST_FILE,
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0600,
flags, TEST_MASK,
&error_abort));
dst = QIO_CHANNEL(qio_channel_file_new_path(
TEST_FILE,
@ -45,18 +50,33 @@ static void test_io_channel_file(void)
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;
#define TEST_FILE "tests/test-io-channel-file.txt"
fd = open(TEST_FILE, O_CREAT | O_TRUNC | O_WRONLY, 0600);
g_assert_cmpint(fd, >, -1);
@ -114,6 +134,7 @@ int main(int argc, char **argv)
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);