diff options
| author | Ross Lagerwall <ross.lagerwall@citrix.com> | 2017-11-01 14:25:24 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2018-02-15 16:54:57 +0000 |
| commit | 902f6e14fc68743ce24efb7d87dc3f8464a78bf3 (patch) | |
| tree | 7ad393040358740e78d39eeafa4b31996d7d2095 /io | |
| parent | a46ded1de5cf0edd6c780e071ddafb92601070b5 (diff) | |
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>
Diffstat (limited to 'io')
| -rw-r--r-- | io/channel-file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/io/channel-file.c b/io/channel-file.c index b383273201..16bf7ed270 100644 --- a/io/channel-file.c +++ b/io/channel-file.c @@ -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, |