[xen staging] tools/libfsimage: Remove the XEN_FSIMAGE_FSDIR environment variable

[patchbot@xxxxxxx]

commit f0161d2d89cfae43a6c5e974568c10b760bf13a4
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Jul 2 16:03:01 2026 +0100
Commit:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
CommitDate: Fri Jul 3 16:52:47 2026 +0200

    tools/libfsimage: Remove the XEN_FSIMAGE_FSDIR environment variable
    
    This was reported to the security team, demonstrating that code execution
    could be achieved, but without a demonstration of a priviliege boundary 
being
    bypassed.
    
    Still, it's a high risk path with no obvious evidence of having been used 
even
    for debugging, so remove the environment variable and use the build time
    $(libdir)/xenfsimage path only.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
    Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
 CHANGELOG.md                             | 1 +
 tools/libfsimage/common/fsimage_plugin.c | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef4e6ae9c4..0a4e5f013c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ The format is based on [Keep a 
Changelog](https://keepachangelog.com/en/1.0.0/)
 
  - Removed xenpm tool on non-x86 platforms as it doesn't actually provide
    anything useful outside of x86.
+ - Removed the XEN_FSIMAGE_FSDIR environment variable.
 
 ## 
[4.21.0](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.21.0)
 - 2025-11-19
 
diff --git a/tools/libfsimage/common/fsimage_plugin.c 
b/tools/libfsimage/common/fsimage_plugin.c
index d0cb9e96a6..539dc24735 100644
--- a/tools/libfsimage/common/fsimage_plugin.c
+++ b/tools/libfsimage/common/fsimage_plugin.c
@@ -121,7 +121,7 @@ fail:
 
 int fsi_init(void)
 {
-       const char *fsdir = getenv("XEN_FSIMAGE_FSDIR");
+       const char *fsdir = FSIMAGE_FSDIR;
        struct dirent *dp = NULL;
        DIR *dir = NULL;
        char *tmp = NULL;
@@ -129,9 +129,6 @@ int fsi_init(void)
        int err;
        int ret = -1;
 
-       if (fsdir == NULL)
-               fsdir = FSIMAGE_FSDIR;
-
        if ((name_max = pathconf(fsdir, _PC_NAME_MAX)) == -1)
                goto fail;
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging