mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-05 00:41:03 +01:00
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From: John Johansen <jjohansen@suse.de>
|
|
Subject: AppArmor: Patch AppArmor for 2.6.25 kernel
|
|
|
|
Add 64 bit capabilities support to AppArmor.
|
|
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
---
|
|
security/apparmor/lsm.c | 3 ++-
|
|
security/apparmor/module_interface.c | 22 ++++++++++++++++++----
|
|
2 files changed, 20 insertions(+), 5 deletions(-)
|
|
|
|
--- a/security/apparmor/lsm.c
|
|
+++ b/security/apparmor/lsm.c
|
|
@@ -462,7 +462,8 @@ static int apparmor_inode_permission(str
|
|
/* allow traverse accesses to directories */
|
|
mask &= ~MAY_EXEC;
|
|
}
|
|
- return aa_permission("inode_permission", inode, nd->dentry, nd->mnt,
|
|
+ return aa_permission("inode_permission", inode, nd->path.dentry,
|
|
+ nd->path.mnt,
|
|
mask, check);
|
|
}
|
|
|
|
--- a/security/apparmor/module_interface.c
|
|
+++ b/security/apparmor/module_interface.c
|
|
@@ -394,15 +394,29 @@ static struct aa_profile *aa_unpack_prof
|
|
if (!aa_is_nameX(e, AA_STRUCTEND, NULL))
|
|
goto fail;
|
|
|
|
- if (!aa_is_u32(e, &(profile->capabilities), NULL))
|
|
+ if (!aa_is_u32(e, &(profile->capabilities.cap[0]), NULL))
|
|
goto fail;
|
|
- if (!aa_is_u32(e, &(profile->audit_caps), NULL))
|
|
+ if (!aa_is_u32(e, &(profile->audit_caps.cap[0]), NULL))
|
|
goto fail;
|
|
- if (!aa_is_u32(e, &(profile->quiet_caps), NULL))
|
|
+ if (!aa_is_u32(e, &(profile->quiet_caps.cap[0]), NULL))
|
|
goto fail;
|
|
- if (!aa_is_u32(e, &(profile->set_caps), NULL))
|
|
+ if (!aa_is_u32(e, &(profile->set_caps.cap[0]), NULL))
|
|
goto fail;
|
|
|
|
+ if (aa_is_nameX(e, AA_STRUCT, "caps64")) {
|
|
+ /* optional upper half of 64 bit caps */
|
|
+ if (!aa_is_u32(e, &(profile->capabilities.cap[1]), NULL))
|
|
+ goto fail;
|
|
+ if (!aa_is_u32(e, &(profile->audit_caps.cap[1]), NULL))
|
|
+ goto fail;
|
|
+ if (!aa_is_u32(e, &(profile->quiet_caps.cap[1]), NULL))
|
|
+ goto fail;
|
|
+ if (!aa_is_u32(e, &(profile->set_caps.cap[1]), NULL))
|
|
+ goto fail;
|
|
+ if (!aa_is_nameX(e, AA_STRUCTEND, NULL))
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
if (!aa_unpack_rlimits(e, profile))
|
|
goto fail;
|
|
|