summaryrefslogtreecommitdiff
path: root/security/apparmor/include/mount.h
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2023-09-10 03:35:22 -0700
committerJohn Johansen <john.johansen@canonical.com>2023-10-18 16:01:32 -0700
commit157a3537d6bc28ceb9a11fc8cb67f2152d860146 (patch)
tree2fcb30f046abf48c7299c872c7705384c5915b68 /security/apparmor/include/mount.h
parentea9bae12d02819556db63348db8bd8441eb316f2 (diff)
apparmor: Fix regression in mount mediation
commit 2db154b3ea8e ("vfs: syscall: Add move_mount(2) to move mounts around") introduced a new move_mount(2) system call and a corresponding new LSM security_move_mount hook but did not implement this hook for any existing LSM. This creates a regression for AppArmor mediation of mount. This patch provides a base mapping of the move_mount syscall to the existing mount mediation. In the future we may introduce additional mediations around the new mount calls. Fixes: 2db154b3ea8e ("vfs: syscall: Add move_mount(2) to move mounts around") CC: stable@vger.kernel.org Reported-by: Andreas Steinmetz <anstein99@googlemail.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/include/mount.h')
-rw-r--r--security/apparmor/include/mount.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/security/apparmor/include/mount.h b/security/apparmor/include/mount.h
index 10c76f906a65..46834f828179 100644
--- a/security/apparmor/include/mount.h
+++ b/security/apparmor/include/mount.h
@@ -38,9 +38,12 @@ int aa_mount_change_type(const struct cred *subj_cred,
struct aa_label *label, const struct path *path,
unsigned long flags);
+int aa_move_mount_old(const struct cred *subj_cred,
+ struct aa_label *label, const struct path *path,
+ const char *old_name);
int aa_move_mount(const struct cred *subj_cred,
- struct aa_label *label, const struct path *path,
- const char *old_name);
+ struct aa_label *label, const struct path *from_path,
+ const struct path *to_path);
int aa_new_mount(const struct cred *subj_cred,
struct aa_label *label, const char *dev_name,