[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/11] softmmu/physmem: Never return directories from file_ram
From: |
David Hildenbrand |
Subject: |
[PATCH v4 07/11] softmmu/physmem: Never return directories from file_ram_open() |
Date: |
Wed, 6 Sep 2023 14:04:59 +0200 |
open() does not fail on directories when opening them readonly (O_RDONLY).
Currently, we succeed opening such directories and fail later during
mmap(), resulting in a misleading error message.
$ ./qemu-system-x86_64 \
-object memory-backend-file,id=ram0,mem-path=tmp,readonly=true,size=1g
qemu-system-x86_64: unable to map backing store for guest RAM: No such device
To identify directories and handle them accordingly in file_ram_open()
also when readonly=true was specified, detect if we just opened a directory
using fstat() instead. Then, fail file_ram_open() right away, similarly
to how we now fail if the file does not exist and we want to open the
file readonly.
With this change, we get a nicer error message:
qemu-system-x86_64: can't open backing store tmp for guest RAM: Is a directory
Note that the only memory-backend-file will end up calling
memory_region_init_ram_from_file() -> qemu_ram_alloc_from_file() ->
file_ram_open().
Reported-by: Thiner Logoer <logoerthiner1@163.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
softmmu/physmem.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 138402b6cf..f1cd3ec28a 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -1299,6 +1299,25 @@ static int file_ram_open(const char *path,
for (;;) {
fd = open(path, readonly ? O_RDONLY : O_RDWR);
if (fd >= 0) {
+ /*
+ * open(O_RDONLY) won't fail with EISDIR. Check manually if we
+ * opened a directory and fail similarly to how we fail ENOENT
+ * in readonly mode. Note that mkstemp() would imply O_RDWR.
+ */
+ if (readonly) {
+ struct stat file_stat;
+
+ if (fstat(fd, &file_stat)) {
+ close(fd);
+ if (errno == EINTR) {
+ continue;
+ }
+ return -errno;
+ } else if (S_ISDIR(file_stat.st_mode)) {
+ close(fd);
+ return -EISDIR;
+ }
+ }
/* @path names an existing file, use it */
break;
}
--
2.41.0
- [PATCH v4 00/11] memory-backend-file related improvements and VM templating support, David Hildenbrand, 2023/09/06
- [PATCH v4 01/11] nvdimm: Reject writing label data to ROM instead of crashing QEMU, David Hildenbrand, 2023/09/06
- [PATCH v4 02/11] softmmu/physmem: Distinguish between file access mode and mmap protection, David Hildenbrand, 2023/09/06
- [PATCH v4 03/11] backends/hostmem-file: Add "rom" property to support VM templating with R/O files, David Hildenbrand, 2023/09/06
- [PATCH v4 05/11] softmmu/physmem: Bail out early in ram_block_discard_range() with readonly files, David Hildenbrand, 2023/09/06
- [PATCH v4 08/11] docs: Don't mention "-mem-path" in multi-process.rst, David Hildenbrand, 2023/09/06
- [PATCH v4 04/11] softmmu/physmem: Remap with proper protection in qemu_ram_remap(), David Hildenbrand, 2023/09/06
- [PATCH v4 09/11] docs: Start documenting VM templating, David Hildenbrand, 2023/09/06
- [PATCH v4 10/11] softmmu/physmem: Hint that "readonly=on, rom=off" exists when opening file R/W for private mapping fails, David Hildenbrand, 2023/09/06
- [PATCH v4 11/11] machine: Improve error message when using default RAM backend id, David Hildenbrand, 2023/09/06
- [PATCH v4 07/11] softmmu/physmem: Never return directories from file_ram_open(),
David Hildenbrand <=
- [PATCH v4 06/11] softmmu/physmem: Fail creation of new files in file_ram_open() with readonly=true, David Hildenbrand, 2023/09/06
- Re: [PATCH v4 00/11] memory-backend-file related improvements and VM templating support, David Hildenbrand, 2023/09/11