From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 20 May 2022 18:03:21 +0000 (+0900)
Subject: sysext: refuse empty release ID to avoid triggering assertion
X-Git-Tag: v251~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30e29edf4c0bb025aa7dc03c415b727fddf996ac;p=thirdparty%2Fsystemd.git

sysext: refuse empty release ID to avoid triggering assertion

Otherwise, the assertion in extension_release_validate() will be
triggered.
---

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 76c2fe69786..364af195e0d 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -478,6 +478,10 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
                         "SYSEXT_LEVEL", &host_os_release_sysext_level);
         if (r < 0)
                 return log_error_errno(r, "Failed to acquire 'os-release' data of OS tree '%s': %m", empty_to_root(arg_root));
+        if (isempty(host_os_release_id))
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "'ID' field not found or empty in 'os-release' data of OS tree '%s': %m",
+                                       empty_to_root(arg_root));
 
         /* Let's now mount all images */
         HASHMAP_FOREACH(img, images) {