diff options
| author | Jan Kara <jack@suse.cz> | 2014-02-17 13:09:50 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2014-02-18 11:17:17 +0100 |
| commit | 45a22f4c11fef4ecd5c61c0a299cd3f23d77be8e (patch) | |
| tree | b1f71eb3ff7209849bd27b0dbb131ea74bd7f63b /fs/notify/fanotify | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| download | linux-stable-45a22f4c11fef4ecd5c61c0a299cd3f23d77be8e.tar.gz linux-stable-45a22f4c11fef4ecd5c61c0a299cd3f23d77be8e.tar.bz2 linux-stable-45a22f4c11fef4ecd5c61c0a299cd3f23d77be8e.zip | |
inotify: Fix reporting of cookies for inotify events
My rework of handling of notification events (namely commit 7053aee26a35
"fsnotify: do not share events between notification groups") broke
sending of cookies with inotify events. We didn't propagate the value
passed to fsnotify() properly and passed 4 uninitialized bytes to
userspace instead (so it is also an information leak). Sadly I didn't
notice this during my testing because inotify cookies aren't used very
much and LTP inotify tests ignore them.
Fix the problem by passing the cookie value properly.
Fixes: 7053aee26a3548ebaba046ae2e52396ccf56ac6c
Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/fanotify')
| -rw-r--r-- | fs/notify/fanotify/fanotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 0e792f5e3147..205dc2163822 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -147,7 +147,7 @@ static int fanotify_handle_event(struct fsnotify_group *group, struct fsnotify_mark *inode_mark, struct fsnotify_mark *fanotify_mark, u32 mask, void *data, int data_type, - const unsigned char *file_name) + const unsigned char *file_name, u32 cookie) { int ret = 0; struct fanotify_event_info *event; |