diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-21 18:55:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-21 18:55:45 +0100 |
| commit | 2dde263d81dc6ded2df086bf9db05396c7c215ee (patch) | |
| tree | 39af457872c697320cb24e49052f161381f97c51 /security | |
| parent | Merge tag 'reiserfs_delete' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | fsnotify: Fix ordering of iput() and watched_objects decrement (diff) | |
| download | linux-2dde263d81dc6ded2df086bf9db05396c7c215ee.tar.xz linux-2dde263d81dc6ded2df086bf9db05396c7c215ee.zip | |
Merge tag 'fsnotify_for_v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"A couple of smaller random fsnotify fixes"
* tag 'fsnotify_for_v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fsnotify: Fix ordering of iput() and watched_objects decrement
fsnotify: fix sending inotify event with unexpected filename
fanotify: allow reporting errors on failure to open fd
fsnotify, lsm: Decouple fsnotify from lsm
Diffstat (limited to 'security')
| -rw-r--r-- | security/security.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/security/security.c b/security/security.c index e2d47dd4087a..09664e09fec9 100644 --- a/security/security.c +++ b/security/security.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <linux/kernel_read_file.h> #include <linux/lsm_hooks.h> -#include <linux/fsnotify.h> #include <linux/mman.h> #include <linux/mount.h> #include <linux/personality.h> @@ -3103,13 +3102,7 @@ int security_file_receive(struct file *file) */ int security_file_open(struct file *file) { - int ret; - - ret = call_int_hook(file_open, file); - if (ret) - return ret; - - return fsnotify_open_perm(file); + return call_int_hook(file_open, file); } /** |