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
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
---
|
|
security/apparmor/apparmorfs.c | 2 +-
|
|
security/apparmor/main.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/security/apparmor/apparmorfs.c
|
|
+++ b/security/apparmor/apparmorfs.c
|
|
@@ -89,7 +89,7 @@ static struct file_operations apparmorfs
|
|
static ssize_t aa_matching_read(struct file *file, char __user *buf,
|
|
size_t size, loff_t *ppos)
|
|
{
|
|
- const char *matching = "pattern=aadfa perms=rwxamlz user:other";
|
|
+ const char *matching = "pattern=aadfa perms=rwxamlk/ user::other";
|
|
|
|
return simple_read_from_buffer(buf, size, ppos, matching,
|
|
strlen(matching));
|
|
--- a/security/apparmor/main.c
|
|
+++ b/security/apparmor/main.c
|
|
@@ -99,7 +99,7 @@ static int aa_link_denied(struct aa_prof
|
|
/* Link always requires 'l' on the link for both parts of the pair.
|
|
* If a subset test is required a permission subset test of the
|
|
* perms for the link are done against the user:group:other of the
|
|
- * target's 'r', 'w', 'x', 'a', 'z', and 'm' permissions.
|
|
+ * target's 'r', 'w', 'x', 'a', 'k', and 'm' permissions.
|
|
*
|
|
* If the link has 'x', an exact match of all the execute flags
|
|
* ('i', 'u', 'p'). safe exec is treated as a subset of unsafe exec
|
|
@@ -388,7 +388,7 @@ static int aa_audit_base(struct aa_profi
|
|
audit_log_format(ab, " info=\"%s\"", sa->info);
|
|
|
|
if (sa->request_mask)
|
|
- aa_audit_file_mask(ab, "request_mask", sa->request_mask);
|
|
+ aa_audit_file_mask(ab, "requested_mask", sa->request_mask);
|
|
|
|
if (sa->denied_mask)
|
|
aa_audit_file_mask(ab, "denied_mask", sa->denied_mask);
|