diff options
| author | Greg Kroah-Hartman <gregkh@kernel.bkbits.net> | 2003-02-03 23:07:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@kernel.bkbits.net> | 2003-02-03 23:07:23 -0800 |
| commit | bee902e3e04465e78c4acefd8c41c6661c4764e8 (patch) | |
| tree | 0ff7a72217d3be9040721c355bdb7e8a1a41a2eb /security | |
| parent | 5ad0c9427d97547b6adbde4244f9732de6ba4248 (diff) | |
| parent | aa91db068340a8091a6abe857d8c3bcb2e5806a1 (diff) | |
| download | history-bee902e3e04465e78c4acefd8c41c6661c4764e8.tar.gz | |
Merge bk://lsm.bkbits.net/linus-2.5
into kernel.bkbits.net:/home/gregkh/linux/lsm-2.5
Diffstat (limited to 'security')
| -rw-r--r-- | security/dummy.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/security/dummy.c b/security/dummy.c index 7f2ad59f9d480f..8a24e65329d90b 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -120,6 +120,11 @@ static void dummy_sb_free_security (struct super_block *sb) return; } +static int dummy_sb_kern_mount (struct super_block *sb) +{ + return 0; +} + static int dummy_sb_statfs (struct super_block *sb) { return 0; @@ -306,11 +311,6 @@ static int dummy_inode_getattr (struct vfsmount *mnt, struct dentry *dentry) return 0; } -static void dummy_inode_post_lookup (struct inode *ino, struct dentry *d) -{ - return; -} - static void dummy_inode_delete (struct inode *ino) { return; @@ -607,6 +607,12 @@ static int dummy_unregister_security (const char *name, struct security_operatio return -EINVAL; } +static void dummy_d_instantiate (struct dentry *dentry, struct inode *inode) +{ + return; +} + + struct security_operations dummy_security_ops; #define set_to_dummy_if_null(ops, function) \ @@ -635,6 +641,7 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, bprm_check_security); set_to_dummy_if_null(ops, sb_alloc_security); set_to_dummy_if_null(ops, sb_free_security); + set_to_dummy_if_null(ops, sb_kern_mount); set_to_dummy_if_null(ops, sb_statfs); set_to_dummy_if_null(ops, sb_mount); set_to_dummy_if_null(ops, sb_check_sb); @@ -668,7 +675,6 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, inode_permission_lite); set_to_dummy_if_null(ops, inode_setattr); set_to_dummy_if_null(ops, inode_getattr); - set_to_dummy_if_null(ops, inode_post_lookup); set_to_dummy_if_null(ops, inode_delete); set_to_dummy_if_null(ops, inode_setxattr); set_to_dummy_if_null(ops, inode_getxattr); @@ -725,5 +731,6 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, sem_semop); set_to_dummy_if_null(ops, register_security); set_to_dummy_if_null(ops, unregister_security); + set_to_dummy_if_null(ops, d_instantiate); } |