diff --git a/kernel-patches/for-mainline/apparmor-audit.diff b/kernel-patches/for-mainline/apparmor-audit.diff index d6f7ac442..4db2e65b7 100644 --- a/kernel-patches/for-mainline/apparmor-audit.diff +++ b/kernel-patches/for-mainline/apparmor-audit.diff @@ -1,6 +1,9 @@ From: Tony Jones Subject: Export audit subsystem for use by modules +Update kenel audit range comments to show AppArmor's registered range of +1500-1599. This range used to be reserved for LSPP but LSPP uses the +SE Linux range and the range was given to AppArmor. Adds necessary export symbols for audit subsystem routines. Changes audit_log_vformat to be externally visible (analagous to vprintf) Patch is not in mainline -- pending AppArmor code submission to lkml @@ -9,12 +12,21 @@ Signed-off-by: Andreas Gruenbacher Signed-off-by: John Johansen --- - include/linux/audit.h | 5 +++++ + include/linux/audit.h | 7 ++++++- kernel/audit.c | 6 ++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 files changed, 10 insertions(+), 3 deletions(-) --- a/include/linux/audit.h +++ b/include/linux/audit.h +@@ -33,7 +33,7 @@ + * 1200 - 1299 messages internal to the audit daemon + * 1300 - 1399 audit event messages + * 1400 - 1499 SE Linux use +- * 1500 - 1599 kernel LSPP events ++ * 1500 - 1599 AppArmor use + * 1600 - 1699 kernel crypto events + * 1700 - 1799 kernel anomaly records + * 1800 - 1999 future kernel use (maybe integrity labels and related events) @@ -114,6 +114,8 @@ #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ #define AUDIT_ANOM_ABEND 1701 /* Process ended abnormally */ diff --git a/kernel-patches/for-mainline/remove_suid.diff b/kernel-patches/for-mainline/remove_suid.diff index 2615b4196..fd71c6944 100644 --- a/kernel-patches/for-mainline/remove_suid.diff +++ b/kernel-patches/for-mainline/remove_suid.diff @@ -21,7 +21,7 @@ Signed-off-by: John Johansen --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c -@@ -2121,7 +2121,7 @@ static ssize_t ntfs_file_aio_write_noloc +@@ -2122,7 +2122,7 @@ static ssize_t ntfs_file_aio_write_noloc goto out; if (!count) goto out; @@ -88,7 +88,7 @@ Signed-off-by: John Johansen extern void remove_inode_hash(struct inode *); --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -1905,20 +1905,20 @@ int should_remove_suid(struct dentry *de +@@ -1906,20 +1906,20 @@ int should_remove_suid(struct dentry *de } EXPORT_SYMBOL(should_remove_suid); @@ -114,7 +114,7 @@ Signed-off-by: John Johansen return 0; } -@@ -2269,7 +2269,7 @@ __generic_file_aio_write_nolock(struct k +@@ -2270,7 +2270,7 @@ __generic_file_aio_write_nolock(struct k if (count == 0) goto out; @@ -125,7 +125,7 @@ Signed-off-by: John Johansen --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c -@@ -405,7 +405,7 @@ xip_file_write(struct file *filp, const +@@ -406,7 +406,7 @@ xip_file_write(struct file *filp, const if (count == 0) goto out_backing; diff --git a/kernel-patches/for-mainline/series b/kernel-patches/for-mainline/series index 51d2d0987..b4372296b 100644 --- a/kernel-patches/for-mainline/series +++ b/kernel-patches/for-mainline/series @@ -70,3 +70,14 @@ file_permission-nameidata.diff # vfs_rmdir-args.diff # vfs_unlink-args.diff # may_delete-args.diff +multi-profile-load.diff +#change_hat-to-change_profile.diff +#filp_caching.diff +#audit_rework.diff +expand_module_interface.diff +rlimits.diff +reload.diff +apparmor-append.diff +apparmor-lock-mediation.diff +apparmor-dac-like-perms.diff +named_transitions.diff diff --git a/kernel-patches/for-mainline/vfs-notify_change.diff b/kernel-patches/for-mainline/vfs-notify_change.diff index e73247dbe..013ea4244 100644 --- a/kernel-patches/for-mainline/vfs-notify_change.diff +++ b/kernel-patches/for-mainline/vfs-notify_change.diff @@ -66,7 +66,7 @@ Signed-off-by: John Johansen return rc; --- a/fs/exec.c +++ b/fs/exec.c -@@ -1564,7 +1564,8 @@ int do_coredump(long signr, int exit_cod +@@ -1562,7 +1562,8 @@ int do_coredump(long signr, int exit_cod goto close_fail; if (!file->f_op->write) goto close_fail; @@ -365,7 +365,7 @@ Signed-off-by: John Johansen int (*check_acl)(struct inode *, int)); --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -1910,7 +1910,7 @@ int __remove_suid(struct path *path, int +@@ -1911,7 +1911,7 @@ int __remove_suid(struct path *path, int struct iattr newattrs; newattrs.ia_valid = ATTR_FORCE | kill; diff --git a/kernel-patches/for-mainline/vfs-unlink.diff b/kernel-patches/for-mainline/vfs-unlink.diff index c5aca99d9..70963b08d 100644 --- a/kernel-patches/for-mainline/vfs-unlink.diff +++ b/kernel-patches/for-mainline/vfs-unlink.diff @@ -87,7 +87,7 @@ Signed-off-by: John Johansen /* --- a/ipc/mqueue.c +++ b/ipc/mqueue.c -@@ -749,7 +749,7 @@ asmlinkage long sys_mq_unlink(const char +@@ -748,7 +748,7 @@ asmlinkage long sys_mq_unlink(const char if (inode) atomic_inc(&inode->i_count);