From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Hildenbrand <david@redhat.com>,
Thiner Logoer <logoerthiner1@163.com>,
Peter Xu <peterx@redhat.com>,
Mario Casquero <mcasquer@redhat.com>
Subject: [GIT PULL 07/12] softmmu/physmem: Never return directories from file_ram_open()
Date: Tue, 19 Sep 2023 12:30:24 +0200 [thread overview]
Message-ID: <20230919103029.235736-8-david@redhat.com> (raw)
In-Reply-To: <20230919103029.235736-1-david@redhat.com>
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().
Message-ID: <20230906120503.359863-8-david@redhat.com>
Reported-by: Thiner Logoer <logoerthiner1@163.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Tested-by: Mario Casquero <mcasquer@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
next prev parent reply other threads:[~2023-09-19 10:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 10:30 [GIT PULL 00/12] Host Memory Backends and Memory devices queue 2023-09-19 David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 01/12] nvdimm: Reject writing label data to ROM instead of crashing QEMU David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 02/12] softmmu/physmem: Distinguish between file access mode and mmap protection David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 03/12] backends/hostmem-file: Add "rom" property to support VM templating with R/O files David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 04/12] softmmu/physmem: Remap with proper protection in qemu_ram_remap() David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 05/12] softmmu/physmem: Bail out early in ram_block_discard_range() with readonly files David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 06/12] softmmu/physmem: Fail creation of new files in file_ram_open() with readonly=true David Hildenbrand
2023-09-19 10:30 ` David Hildenbrand [this message]
2023-09-19 10:30 ` [GIT PULL 08/12] docs: Don't mention "-mem-path" in multi-process.rst David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 09/12] docs: Start documenting VM templating David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 10/12] softmmu/physmem: Hint that "readonly=on, rom=off" exists when opening file R/W for private mapping fails David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 11/12] machine: Improve error message when using default RAM backend id David Hildenbrand
2023-09-19 10:30 ` [GIT PULL 12/12] memory: avoid updating ioeventfds for some address_space David Hildenbrand
2023-09-19 19:13 ` [GIT PULL 00/12] Host Memory Backends and Memory devices queue 2023-09-19 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230919103029.235736-8-david@redhat.com \
--to=david@redhat.com \
--cc=logoerthiner1@163.com \
--cc=mcasquer@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).