inotify: Avoid reporting event with invalid wd
Jan Kara
maintainerPATCH 1/1 inotify: Avoid reporting event with invalid wd
When inotify_freeing_mark() races with inotify_handle_inode_event() it can happen that inotify_handle_inode_event() sees that i_mark->wd got already reset to -1 and reports this value to userspace which can confuse the inotify listener. Avoid the problem by validating that wd is sensible (and pretend the mark got removed before the event got generated otherwise).
--- fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
I plan to merge this fix through my tree.
fs/notify/inotify/inotify_fsnotify.c +9 -2
@@ -65,7 +65,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,struct fsnotify_event *fsn_event;struct fsnotify_group *group = inode_mark->group;int ret; -int len =0 ; +int len =0 , wd;int alloc_len =sizeof (struct inotify_event_info );struct mem_cgroup *old_memcg;
@@ -80,6 +80,13 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask, i_mark = container_of(inode_mark, struct inotify_inode_mark, fsn_mark); +/* +* We can be racing with mark being detached. Don't report event with +* invalid wd. +*/ + wd =READ_ONCE (i_mark->wd); +if (wd ==-1 ) +return 0 ;/* * Whoever is interested in the event, pays for the allocation. Do not * trigger OOM killer in the target monitoring memcg as it may have
@@ -110,7 +117,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask, fsn_event = &event->fse;fsnotify_init_event (fsn_event); event->mask = mask; - event->wd = i_mark->wd; + event->wd = wd; event->sync_cookie = cookie; event->name_len = len;if (len)
Signature · 1 line
2.35.3
Quoted 8 lines · Jan Kara
When
inotify_freeing_mark()races withinotify_handle_inode_event()it can happen thatinotify_handle_inode_event()sees thati_mark->wdgot already reset to -1 and reports this value to userspace which can confuse the inotify listener. Avoid the problem by validating that wd is sensible (and pretend the mark got removed before the event got generated otherwise).
Quoted 4 lines
Fixes 7e790dd5fc93 ("inotify: fix error paths in inotify_update_watch")Reported-by [email protected]Signed-off-by Jan Kara <[email protected]>
Makes sense.
Quoted 45 lines
--- fs/notify/inotify/inotify_fsnotify.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)I plan to merge this fix through my tree.
fs/notify/inotify/inotify_fsnotify.c +9
-3@@ -65,7 +65,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask,struct fsnotify_event *fsn_event;struct fsnotify_group *group = inode_mark->group;int ret; -int len =0 ; +int len =0 , wd;int alloc_len =sizeof (struct inotify_event_info );struct mem_cgroup *old_memcg;@@ -80,6 +80,13 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask, i_mark = container_of(inode_mark, struct inotify_inode_mark, fsn_mark); +/* +* We can be racing with mark being detached. Don't report event with +* invalid wd. +*/ + wd =READ_ONCE (i_mark->wd); +if (wd ==-1 ) +return 0 ;/* * Whoever is interested in the event, pays for the allocation. Do not * trigger OOM killer in the target monitoring memcg as it may have @@ -110,7 +117,7 @@ int inotify_handle_inode_event(struct fsnotify_mark *inode_mark, u32 mask, fsn_event = &event->fse;fsnotify_init_event (fsn_event); event->mask = mask; - event->wd = i_mark->wd; + event->wd = wd; event->sync_cookie = cookie; event->name_len = len;if (len) --2.35.3
Jan Kara
maintainerQuoted 9 lines · Amir Goldstein
Quoted 8 lines · Jan Kara
When
inotify_freeing_mark()races withinotify_handle_inode_event()it can happen thatinotify_handle_inode_event()sees thati_mark->wdgot already reset to -1 and reports this value to userspace which can confuse the inotify listener. Avoid the problem by validating that wd is sensible (and pretend the mark got removed before the event got generated otherwise).
Quoted 8 lines
Quoted 4 lines
Fixes 7e790dd5fc93 ("inotify: fix error paths in inotify_update_watch")Reported-by [email protected]Signed-off-by Jan Kara <[email protected]>Makes sense.
Reviewed-by Amir Goldstein <[email protected]>
Thanks. I've pulled the patch into my tree.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR