util: introduce qemu_open and qemu_create with error reporting

qemu_open_old() works like open(): set errno and return -1 on failure.
It has even more failure modes, though.  Reporting the error clearly
to users is basically impossible for many of them.

Our standard cure for "errno is too coarse" is the Error object.
Introduce two new helper methods:

  int qemu_open(const char *name, int flags, Error **errp);
  int qemu_create(const char *name, int flags, mode_t mode, Error **errp);

Note that with this design we no longer require or even accept the
O_CREAT flag. Avoiding overloading the two distinct operations
means we can avoid variable arguments which would prevent 'errp' from
being the last argument. It also gives us a guarantee that the 'mode' is
given when creating files, avoiding a latent security bug.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-07-01 16:30:35 +01:00
parent ebb3d49cb2
commit c490af57cb
2 changed files with 22 additions and 0 deletions

View File

@ -497,7 +497,13 @@ int qemu_madvise(void *addr, size_t len, int advice);
int qemu_mprotect_rwx(void *addr, size_t size); int qemu_mprotect_rwx(void *addr, size_t size);
int qemu_mprotect_none(void *addr, size_t size); int qemu_mprotect_none(void *addr, size_t size);
/*
* Don't introduce new usage of this function, prefer the following
* qemu_open/qemu_create that take an "Error **errp"
*/
int qemu_open_old(const char *name, int flags, ...); int qemu_open_old(const char *name, int flags, ...);
int qemu_open(const char *name, int flags, Error **errp);
int qemu_create(const char *name, int flags, mode_t mode, Error **errp);
int qemu_close(int fd); int qemu_close(int fd);
int qemu_unlink(const char *name); int qemu_unlink(const char *name);
#ifndef _WIN32 #ifndef _WIN32

View File

@ -341,6 +341,22 @@ qemu_open_internal(const char *name, int flags, mode_t mode, Error **errp)
} }
int qemu_open(const char *name, int flags, Error **errp)
{
assert(!(flags & O_CREAT));
return qemu_open_internal(name, flags, 0, errp);
}
int qemu_create(const char *name, int flags, mode_t mode, Error **errp)
{
assert(!(flags & O_CREAT));
return qemu_open_internal(name, flags | O_CREAT, mode, errp);
}
int qemu_open_old(const char *name, int flags, ...) int qemu_open_old(const char *name, int flags, ...)
{ {
va_list ap; va_list ap;