From b4a2eb3b1a546751a8aa19878a2c280bd79a1a89 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 12 Nov 2025 17:37:13 -0600
Subject: [PATCH 1/2] test(script): Verify use with memfd

---
 Cargo.lock                      | 10 ++++++++++
 Cargo.toml                      |  4 ++++
 tests/testsuite/script/cargo.rs | 35 +++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 9ab1742bfbe..3e101ff0577 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -337,6 +337,7 @@ dependencies = [
  "libc",
  "libgit2-sys",
  "memchr",
+ "memfd",
  "opener",
  "openssl",
  "os_info",
@@ -2894,6 +2895,15 @@ version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
+[[package]]
+name = "memfd"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
+dependencies = [
+ "rustix",
+]
+
 [[package]]
 name = "memmap2"
 version = "0.9.9"
diff --git a/Cargo.toml b/Cargo.toml
index 0f807a3d3c9..e80e07f64ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +67,7 @@ libc = "0.2.177"
 libgit2-sys = "0.18.2"
 libloading = "0.8.9"
 memchr = "2.7.6"
+memfd = "0.6.5"
 miow = "0.6.1"
 opener = "0.8.3"
 openssl = "0.10.74"
@@ -261,6 +262,9 @@ gix-transport = { version = "0.49.1", features = ["http-client-insecure-credenti
 same-file.workspace = true
 snapbox.workspace = true
 
+[target.'cfg(target_os = "linux")'.dev-dependencies]
+memfd.workspace = true
+
 [build-dependencies]
 flate2.workspace = true
 tar.workspace = true
diff --git a/tests/testsuite/script/cargo.rs b/tests/testsuite/script/cargo.rs
index 6cc590c7c17..c381f9a6d1b 100644
--- a/tests/testsuite/script/cargo.rs
+++ b/tests/testsuite/script/cargo.rs
@@ -1,4 +1,5 @@
 use std::fs;
+use std::io::Write;
 
 use crate::prelude::*;
 use cargo_test_support::basic_manifest;
@@ -2174,3 +2175,37 @@ args: []
 "#]])
         .run();
 }
+
+#[cargo_test(nightly, reason = "-Zscript is unstable")]
+#[cfg(target_os = "linux")]
+fn memfd_script() {
+    use std::os::fd::AsRawFd;
+
+    let fd = memfd::MemfdOptions::new()
+        .close_on_exec(false)
+        .create("otkeep-script")
+        .unwrap();
+    let mut file = fd.into_file();
+    file.write_all(ECHO_SCRIPT.as_bytes()).unwrap();
+    file.flush().unwrap();
+
+    let raw_fd = file.as_raw_fd();
+
+    let p = cargo_test_support::project()
+        .file("echo.rs", ECHO_SCRIPT)
+        .build();
+
+    p.cargo(&format!("-Zscript -v /proc/self/fd/{raw_fd}"))
+        .masquerade_as_nightly_cargo(&["script"])
+        .with_status(101)
+        .with_stdout_data(str![""])
+        .with_stderr_data(str![[r#"
+[WARNING] `package.edition` is unspecified, defaulting to `2024`
+
+thread 'main' ([..]) panicked at src/cargo/core/workspace.rs:465:18:
+template is correct: [NOT_FOUND]
+[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+
+"#]])
+        .run();
+}

From ed399ad22287dc0b306ba0bb8aa1e8dd805c7384 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 12 Nov 2025 17:39:36 -0600
Subject: [PATCH 2/2] fix(config): Fallback to non-canonical path for
 workspace-path-hash

Fixes #16110
---
 src/cargo/util/context/mod.rs   |  3 ++-
 tests/testsuite/script/cargo.rs | 15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/cargo/util/context/mod.rs b/src/cargo/util/context/mod.rs
index dfe60d5e73e..a7dc7e199f4 100644
--- a/src/cargo/util/context/mod.rs
+++ b/src/cargo/util/context/mod.rs
@@ -710,7 +710,8 @@ impl GlobalContext {
                     .to_string(),
             ),
             ("{workspace-path-hash}", {
-                let real_path = std::fs::canonicalize(workspace_manifest_path)?;
+                let real_path = std::fs::canonicalize(workspace_manifest_path)
+                    .unwrap_or_else(|_err| workspace_manifest_path.to_owned());
                 let hash = crate::util::hex::short_hash(&real_path);
                 format!("{}{}{}", &hash[0..2], std::path::MAIN_SEPARATOR, &hash[2..])
             }),
diff --git a/tests/testsuite/script/cargo.rs b/tests/testsuite/script/cargo.rs
index c381f9a6d1b..1fa8960b27d 100644
--- a/tests/testsuite/script/cargo.rs
+++ b/tests/testsuite/script/cargo.rs
@@ -2197,14 +2197,17 @@ fn memfd_script() {
 
     p.cargo(&format!("-Zscript -v /proc/self/fd/{raw_fd}"))
         .masquerade_as_nightly_cargo(&["script"])
-        .with_status(101)
-        .with_stdout_data(str![""])
+        .with_stdout_data(str![[r#"
+current_exe: [ROOT]/home/.cargo/build/[HASH]/target/debug/package
+arg0: /proc/self/fd/[..]
+args: []
+
+"#]])
         .with_stderr_data(str![[r#"
 [WARNING] `package.edition` is unspecified, defaulting to `2024`
-
-thread 'main' ([..]) panicked at src/cargo/core/workspace.rs:465:18:
-template is correct: [NOT_FOUND]
-[NOTE] run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+[COMPILING] package v0.0.0 (/proc/self/fd/[..])
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[RUNNING] `[ROOT]/home/.cargo/build/[HASH]/target/debug/package`
 
 "#]])
         .run();