mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 05:17:59 +00:00
Code Issues Releases Wiki Activity

update namespace semaphore patch for changes in 2.6.20

Browse Source
This commit is contained in:
John Johansen 2007-03-19 11:10:01 +00:00
parent 9aae261afd
commit 31b181fcf8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel-patches/2.6.20/patches/apparmor_namespacesem.patch
View File

@ -8,31 +8,31 @@ Patch is not in mainline -- pending AppArmor code submission to lkml
--- ---
fs/namespace.c | 3 ++- fs/namespace.c | 3 ++-
include/linux/namespace.h | 3 +++ include/linux/mnt_namespace.h | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-) 2 files changed, 5 insertions(+), 1 deletion(-)
--- linux-2.6.18.orig/fs/namespace.c --- linux-2.6.19.orig/fs/namespace.c
+++ linux-2.6.18/fs/namespace.c +++ linux-2.6.19/fs/namespace.c
@@ -45,7 +45,8 @@ static int event; @@ -37,7 +37,8 @@ static int event;
static struct list_head *mount_hashtable __read_mostly; static struct list_head *mount_hashtable __read_mostly;
static int hash_mask __read_mostly, hash_bits __read_mostly; static int hash_mask __read_mostly, hash_bits __read_mostly;
static kmem_cache_t *mnt_cache __read_mostly; static struct kmem_cache *mnt_cache __read_mostly;
-static struct rw_semaphore namespace_sem; -static struct rw_semaphore namespace_sem;
+struct rw_semaphore namespace_sem; +struct rw_semaphore namespace_sem;
+EXPORT_SYMBOL_GPL(namespace_sem); +EXPORT_SYMBOL_GPL(namespace_sem);
/* /sys/fs */ /* /sys/fs */
decl_subsys(fs, NULL, NULL); decl_subsys(fs, NULL, NULL);
--- linux-2.6.18.orig/include/linux/namespace.h --- linux-2.6.19.orig/include/linux/mnt_namespace.h
+++ linux-2.6.18/include/linux/namespace.h +++ linux-2.6.19/include/linux/mnt_namespace.h
@@ -5,6 +5,9 @@ @@ -6,6 +6,9 @@
#include <linux/mount.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/nsproxy.h>
+/* exported for AppArmor (SubDomain) */ +/* exported for AppArmor (SubDomain) */
+extern struct rw_semaphore namespace_sem; +extern struct rw_semaphore namespace_sem;
+ +
struct namespace { struct mnt_namespace {
atomic_t count; atomic_t count;
struct vfsmount * root; struct vfsmount * root;