diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 14:18:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 14:18:28 -0500 |
| commit | 6339204ecc2aa2067a99595522de0403f0854bb8 (patch) | |
| tree | 02665f55428bf646722cdc59750d2c2dee0595d1 /security/security.c | |
| parent | 80e1e823989ec44d8e35bdfddadbddcffec90424 (diff) | |
| parent | 89068c576bf324ef6fbd50dfc745148f7def202c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Take ima_file_free() to proper place.
ima: rename PATH_CHECK to FILE_CHECK
ima: rename ima_path_check to ima_file_check
ima: initialize ima before inodes can be allocated
fix ima breakage
Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb
befs: fix leak
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 24e060be9fa5..122b748d0f4c 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -666,8 +666,6 @@ int security_file_alloc(struct file *file) | |||
| 666 | void security_file_free(struct file *file) | 666 | void security_file_free(struct file *file) |
| 667 | { | 667 | { |
| 668 | security_ops->file_free_security(file); | 668 | security_ops->file_free_security(file); |
| 669 | if (file->f_dentry) | ||
| 670 | ima_file_free(file); | ||
| 671 | } | 669 | } |
| 672 | 670 | ||
| 673 | int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 671 | int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |