git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: factor out bd_may_claim()
[safe/jmp/linux-2.6]
/
security
/
security.c
diff --git
a/security/security.c
b/security/security.c
index
971092c
..
687c6fd
100644
(file)
--- a/
security/security.c
+++ b/
security/security.c
@@
-23,10
+23,12
@@
static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
CONFIG_DEFAULT_SECURITY;
/* things that live in capability.c */
CONFIG_DEFAULT_SECURITY;
/* things that live in capability.c */
-extern struct security_operations default_security_ops;
extern void security_fixup_ops(struct security_operations *ops);
extern void security_fixup_ops(struct security_operations *ops);
-struct security_operations *security_ops; /* Initialized to NULL */
+static struct security_operations *security_ops;
+static struct security_operations default_security_ops = {
+ .name = "default",
+};
static inline int verify(struct security_operations *ops)
{
static inline int verify(struct security_operations *ops)
{
@@
-63,6
+65,11
@@
int __init security_init(void)
return 0;
}
return 0;
}
+void reset_security_ops(void)
+{
+ security_ops = &default_security_ops;
+}
+
/* Save user chosen LSM */
static int __init choose_lsm(char *str)
{
/* Save user chosen LSM */
static int __init choose_lsm(char *str)
{
@@
-666,8
+673,6
@@
int security_file_alloc(struct file *file)
void security_file_free(struct file *file)
{
security_ops->file_free_security(file);
void security_file_free(struct file *file)
{
security_ops->file_free_security(file);
- if (file->f_dentry)
- ima_file_free(file);
}
int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)