mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Johannes Schneider <johannes.schneider@leica-geosystems.com>
To: barebox@lists.infradead.org
Cc: Marco Felsch <m.felsch@pengutronix.de>,
	Johannes Schneider <johannes.schneider@leica-geosystems.com>
Subject: [PATCH v1 02/14] efi: loader: file: report EFI_UNSUPPORTED for volumes without a filesystem
Date: Sun,  4 Oct 2026 01:19:35 +0000	[thread overview]
Message-ID: <20261004011958.3255011-3-johannes.schneider@leica-geosystems.com> (raw)
In-Reply-To: <20261004011958.3255011-1-johannes.schneider@leica-geosystems.com>

OpenVolume() on a partition without a filesystem, such as a raw slot a
kernel or UKI is booted from, fails in cdev_mount() and returns
EFI_DEVICE_ERROR. The UEFI specification prescribes EFI_UNSUPPORTED for
that, and callers rely on it: systemd-stub skips EFI_UNSUPPORTED quietly
but logs any other error, and its log_wait() then stalls boot by up to
10 s:

  stub.c:587@load_addons: Unable to open root directory: Device error
  cpio.c:340@pack_cpio: Unable to open root directory: Device error  (x6)

Return EFI_UNSUPPORTED when no filesystem driver recognizes the device.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>
---
 efi/loader/protocols/file.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/efi/loader/protocols/file.c b/efi/loader/protocols/file.c
index ea7b0df82e..bfcf14f0e0 100644
--- a/efi/loader/protocols/file.c
+++ b/efi/loader/protocols/file.c
@@ -30,6 +30,8 @@
 #include <malloc.h>
 #include <dirent.h>
 #include <fs.h>
+#include <linux/sprintf.h>
+#include <xfuncs.h>
 
 #define MAX_UTF8_PER_UTF16 3
 
@@ -1012,6 +1014,16 @@ efi_open_volume(struct efi_simple_file_system_protocol *this,
 
 	EFI_ENTRY("%p, %p", this, root);
 
+	/* No filesystem on the volume is EFI_UNSUPPORTED, not a device error */
+	if (!cdev_get_mount_path(fs->cdev)) {
+		char *devpath = basprintf("/dev/%s", cdev_name(fs->cdev));
+		bool has_fs = fs_detect(devpath, "");
+
+		free(devpath);
+		if (!has_fs)
+			return EFI_EXIT(EFI_UNSUPPORTED);
+	}
+
 	path = cdev_mount(fs->cdev);
 	if (IS_ERR(path))
 		return EFI_EXIT(EFI_DEVICE_ERROR);
-- 
2.43.0




  parent reply	other threads:[~2026-10-04  1:25 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-04  1:19 [PATCH v1 00/14] efi: loader: boot Authenticode-signed UKIs Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 01/14] mfd: hgs-efi: do not claim the name of the EFI loader's device Johannes Schneider
2026-10-04  1:19 ` Johannes Schneider [this message]
2026-10-04  1:19 ` [PATCH v1 03/14] efi: loader: bootm: free the devicetree after installing it Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 04/14] efi: loader: provide EFI_DT_FIXUP_PROTOCOL Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 05/14] efi: loader: pe: add helpers for the image size and a named section Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 06/14] efi: loader: bootm: load only the PE image, not the whole file Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 07/14] efi: loader: bootm: pass the kernel command line to UKIs Johannes Schneider
2026-10-05 17:18   ` Ahmad Fatoum
2026-10-04  1:19 ` [PATCH v1 08/14] efi: loader: verify Authenticode signatures against built-in keys Johannes Schneider
2026-10-05  5:33   ` Ahmad Fatoum
2026-10-05  5:45     ` SCHNEIDER Johannes
2026-10-09  0:07       ` SCHNEIDER Johannes
2026-10-04  1:19 ` [PATCH v1 09/14] efi: loader: authenticode: add a fuzz test Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 10/14] efi: loader: authenticate LoadImage() images when signing is forced Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 11/14] efi: loader: file: expose no filesystem when signed images are forced Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 12/14] bootm: efi: boot signed EFI images " Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 13/14] efi: loader: bootm: install a devicetree for matching UKI devicetrees Johannes Schneider
2026-10-04  1:19 ` [PATCH v1 14/14] efi: loader: bootm: apply overlays carried by a UKI Johannes Schneider

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=20261004011958.3255011-3-johannes.schneider@leica-geosystems.com \
    --to=johannes.schneider@leica-geosystems.com \
    --cc=barebox@lists.infradead.org \
    --cc=m.felsch@pengutronix.de \
    /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