From: Łukasz Stelmach <l.stelmach@samsung.com>
Date: Tue, 29 Oct 2024 14:53:45 +0000 (+0100)
Subject: core: make mount(8) and swapon(8) inherit SMACK label from systemd
X-Git-Tag: v256.8~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d060fb7eb6be828c3a6a822e38dabcc627ac98d;p=thirdparty%2Fsystemd.git

core: make mount(8) and swapon(8) inherit SMACK label from systemd

By default mount(8), umount(8), swapon(8) and swapoff(8) should run with
with the SMACK label inherited from systemd rather than the default one
meant for services.

Fixes: aa5ae9711ef3cd0c69b7fcfbd65bca05fb704a8a
Follow-up-for: 20bbf5ee4c6c80599a91e7a4b7474e931a27db4a
(cherry picked from commit 8144537a81c7a815af3d4c63cd8545ee17b2715d)
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 942495fb19a..66917dfa88b 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -895,6 +895,9 @@ static int mount_spawn(Mount *m, ExecCommand *c, PidRef *ret_pid) {
         if (r < 0)
                 return r;
 
+        /* Assume the label inherited from systemd as the fallback */
+        exec_params.fallback_smack_process_label = NULL;
+
         r = exec_spawn(UNIT(m),
                        c,
                        &m->exec_context,
diff --git a/src/core/swap.c b/src/core/swap.c
index c4d2ba8f3ac..c89a723a4be 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -647,6 +647,9 @@ static int swap_spawn(Swap *s, ExecCommand *c, PidRef *ret_pid) {
         if (r < 0)
                 return r;
 
+        /* Assume the label inherited from systemd as the fallback */
+        exec_params.fallback_smack_process_label = NULL;
+
         r = exec_spawn(UNIT(s),
                        c,
                        &s->exec_context,