b7ebf97389
Resolves: RHEL-155454, RHEL-155805, RHEL-155396, RHEL-158303, RHEL-158354, RHEL-143728, RHEL-168098, RHEL-143028
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 5f8d0355128c2aaa59ffc56916d1939d6022e6db Mon Sep 17 00:00:00 2001
|
|
From: Luca Boccassi <luca.boccassi@gmail.com>
|
|
Date: Wed, 11 Mar 2026 13:27:14 +0000
|
|
Subject: [PATCH] nspawn: normalize pivot_root paths
|
|
|
|
Originally reported on yeswehack.com as:
|
|
YWH-PGM9780-116
|
|
|
|
Follow-up for b53ede699cdc5233041a22591f18863fb3fe2672
|
|
|
|
(cherry picked from commit 7b85f5498a958e5bb660c703b8f4a71cceed3373)
|
|
|
|
Resolves: RHEL-158303
|
|
---
|
|
src/nspawn/nspawn-mount.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
|
|
index ddbdba6fb6..c233cdf600 100644
|
|
--- a/src/nspawn/nspawn-mount.c
|
|
+++ b/src/nspawn/nspawn-mount.c
|
|
@@ -1309,7 +1309,9 @@ int pivot_root_parse(char **pivot_root_new, char **pivot_root_old, const char *s
|
|
|
|
if (!path_is_absolute(root_new))
|
|
return -EINVAL;
|
|
- if (root_old && !path_is_absolute(root_old))
|
|
+ if (!path_is_normalized(root_new))
|
|
+ return -EINVAL;
|
|
+ if (root_old && (!path_is_absolute(root_old) || !path_is_normalized(root_old)))
|
|
return -EINVAL;
|
|
|
|
free_and_replace(*pivot_root_new, root_new);
|