45a22f4c11
My rework of handling of notification events (namely commit7053aee26a"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:7053aee26aReported-by: Vegard Nossum <vegard.nossum@oracle.com> Signed-off-by: Jan Kara <jack@suse.cz>
33 lines
870 B
C
33 lines
870 B
C
#include <linux/fsnotify_backend.h>
|
|
#include <linux/inotify.h>
|
|
#include <linux/slab.h> /* struct kmem_cache */
|
|
|
|
struct inotify_event_info {
|
|
struct fsnotify_event fse;
|
|
int wd;
|
|
u32 sync_cookie;
|
|
int name_len;
|
|
char name[];
|
|
};
|
|
|
|
struct inotify_inode_mark {
|
|
struct fsnotify_mark fsn_mark;
|
|
int wd;
|
|
};
|
|
|
|
static inline struct inotify_event_info *INOTIFY_E(struct fsnotify_event *fse)
|
|
{
|
|
return container_of(fse, struct inotify_event_info, fse);
|
|
}
|
|
|
|
extern void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark,
|
|
struct fsnotify_group *group);
|
|
extern int inotify_handle_event(struct fsnotify_group *group,
|
|
struct inode *inode,
|
|
struct fsnotify_mark *inode_mark,
|
|
struct fsnotify_mark *vfsmount_mark,
|
|
u32 mask, void *data, int data_type,
|
|
const unsigned char *file_name, u32 cookie);
|
|
|
|
extern const struct fsnotify_ops inotify_fsnotify_ops;
|