mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-06 09:21:00 +01:00
923fc92c7a
- fix split init so that apparmor can be enabled at the boot command line. The init was broken so that apparmor couldn't be enabled unless enabled by default. M apparmor-fix-lock-letter.diff - fix the lock letter being reported (z -> k) and update some comments A apparmor-create-append.diff - fix semanitc bug where full write perms were needed to create a new file, where only append is needed. M fix-link-subset.diff - partial fix of link subset A no-safex-link-subset.diff - more link subset fixes A audit-log-type-in-syslog.diff - fix audit type being missing when messages go to syslog. This patch is needed for apparmor to work when messages go to syslog instead of auditd. This patch can be dropped when upstream includes the patch to report audit number when reporting to syslog A audit-uid.diff - report the fsuid to the log A hat_perm.diff - setup to use hat permissions instead of just profile search for 2.3 A apparmor-failed-name-error.diff - fix a bug where on failed name resolution no error or information is output. It now reports info in the status field and includes an error_code A extend-x-mods.diff - extend the x-mods in preparation of audit ctl A apparmor-secondary-accept.diff - extend the dfa to have a second accept table used for audit ctl A apparmor-audit-flags2.diff - extend apparmor to support audit ctl of individual permissions. - finish fixing link-subset A fix-change_profile-namespace.diff - Not applied, ignore
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
---
|
|
security/apparmor/apparmor.h | 5 +++--
|
|
security/apparmor/main.c | 9 +++++++++
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
--- a/security/apparmor/apparmor.h
|
|
+++ b/security/apparmor/apparmor.h
|
|
@@ -68,10 +68,11 @@
|
|
#define AA_ALL_EXEC_MODS (AA_USER_EXEC_MODS | \
|
|
AA_OTHER_EXEC_MODS)
|
|
|
|
-/* shared permissions that are not duplicated in user:group:other */
|
|
+/* shared permissions that are not duplicated in user::other */
|
|
+#define AA_CHANGE_HAT 0x20000000
|
|
#define AA_CHANGE_PROFILE 0x40000000
|
|
|
|
-#define AA_SHARED_PERMS (AA_CHANGE_PROFILE)
|
|
+#define AA_SHARED_PERMS (AA_CHANGE_HAT | AA_CHANGE_PROFILE)
|
|
|
|
#define AA_VALID_PERM_MASK (AA_FILE_PERMS | AA_SHARED_PERMS)
|
|
|
|
--- a/security/apparmor/main.c
|
|
+++ b/security/apparmor/main.c
|
|
@@ -1300,6 +1300,15 @@ repeat:
|
|
|
|
if (hat_name) {
|
|
char *name, *profile_name;
|
|
+ /* Not Yet. This perm check is currently done by searching
|
|
+ for the hat profile. When hat style profile names
|
|
+ become more generic then this will be needed.
|
|
+ if (!(aa_match(profile->file_rules, hat_name) &
|
|
+ AA_CHANGE_PROFILE)) {
|
|
+ error = -EACCES;
|
|
+ goto out;
|
|
+ }
|
|
+ */
|
|
if (previous_profile)
|
|
profile_name = previous_profile->name;
|
|
else
|