mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fold in fix-named-transitions, update d_path-keep connected to not use MS_NOUSER

Browse source
This commit is contained in:
John Johansen 2008-05-27 11:35:44 +00:00
parent 4be9cf08e7
commit 613471f84c
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel-patches/for-mainline/apparmor-main.diff
View file

@ -941,7 +941,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
+ default: + default:
+ /* all other indexes are named transitions */ + /* all other indexes are named transitions */
+ index = AA_EXEC_INDEX(xmode); + index = AA_EXEC_INDEX(xmode);
+ if (index - 4 > profile->exec_table_size) { + if (index - 4 >= profile->exec_table_size) {
+ sa->info = "invalid named transition - exec failed"; + sa->info = "invalid named transition - exec failed";
+ sa->error_code = -EACCES; + sa->error_code = -EACCES;
+ new_profile = ERR_PTR(-EACCES); + new_profile = ERR_PTR(-EACCES);

7
kernel-patches/for-mainline/apparmor-module_interface.diff
View file

@ -10,8 +10,8 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
--- ---
security/apparmor/match.c | 364 ++++++++++++++ security/apparmor/match.c | 364 ++++++++++++++
security/apparmor/match.h | 87 +++ security/apparmor/match.h | 87 +++
security/apparmor/module_interface.c | 874 +++++++++++++++++++++++++++++++++++ security/apparmor/module_interface.c | 875 +++++++++++++++++++++++++++++++++++
3 files changed, 1325 insertions(+) 3 files changed, 1326 insertions(+)
--- /dev/null --- /dev/null
+++ b/security/apparmor/match.c +++ b/security/apparmor/match.c
@ -472,7 +472,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
+#endif /* __MATCH_H */ +#endif /* __MATCH_H */
--- /dev/null --- /dev/null
+++ b/security/apparmor/module_interface.c +++ b/security/apparmor/module_interface.c
@@ -0,0 +1,874 @@ @@ -0,0 +1,875 @@
+/* +/*
+ * Copyright (C) 1998-2007 Novell/SUSE + * Copyright (C) 1998-2007 Novell/SUSE
+ * + *
@ -778,6 +778,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
+ goto fail; + goto fail;
+ if (!aa_is_nameX(e, AA_STRUCTEND, NULL)) + if (!aa_is_nameX(e, AA_STRUCTEND, NULL))
+ goto fail; + goto fail;
+ profile->exec_table_size = size;
+ } + }
+ return 1; + return 1;
+ +

12
kernel-patches/for-mainline/series
View file

@ -115,9 +115,9 @@ apparmor-network.diff
#fix-net.diff #fix-net.diff
apparmor-rlimits.diff apparmor-rlimits.diff
audit-log-type-in-syslog.diff audit-log-type-in-syslog.diff
fix-named-transitions.diff #fix-named-transitions.diff
apparmor-xmods-accept-entry.diff #apparmor-xmods-accept-entry.diff
apparmor-split-audit-deny.diff #apparmor-split-audit-deny.diff
apparmor-cond-uid.diff #apparmor-cond-uid.diff
apparmor-quiet-control.diff #apparmor-quiet-control.diff
apparmor-direct-complain.diff #apparmor-direct-complain.diff