From: Luca Boccassi <bluca@debian.org>
Date: Tue, 11 Oct 2022 17:28:10 +0000 (+0100)
Subject: mount-util: do not pass 'x-*' options to mount syscall
X-Git-Tag: v252-rc2~54^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac6086fdf63f1c2b26baa955d13faa21afb2aeb1;p=thirdparty%2Fsystemd.git

mount-util: do not pass 'x-*' options to mount syscall

They will not be recognized. libmount filters them manually.
---

diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index c504ce8feef..6742b7c755b 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -765,7 +765,9 @@ int mount_option_mangle(
                 }
 
                 /* If 'word' is not a mount flag, then store it in '*ret_remaining_options'. */
-                if (!ent->name && !strextend_with_separator(&ret, ",", word))
+                if (!ent->name &&
+                    !startswith_no_case(word, "x-") &&
+                    !strextend_with_separator(&ret, ",", word))
                         return -ENOMEM;
         }