fsnotify: fix list walk order
PATCH 1/2 fsnotify: fix list walk order
Marks were stored on the inode and vfsmonut mark list in order from highest memory address to lowest memory address. The code to walk those lists thought they were in order from lowest to highest with unpredictable results when trying to match up marks from each. It was possible that extra events would be sent to userspace when inode marks ignoring events wouldn't get matched with the vfsmount marks.
This problem only affected fanotify when using both vfsmount and inode marks simultaneously.
--- fs/notify/fsnotify.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
fs/notify/fsnotify.c +5 -6
@@ -261,27 +261,26 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,while (inode_node || vfsmount_node) { used_inode = used_vfsmount = false; + inode_group = vfsmount_group =NULL ;if (inode_node) { inode_mark =hlist_entry (srcu_dereference (inode_node, &fsnotify_mark_srcu), struct fsnotify_mark, i.i_list); inode_group = inode_mark->group; - }else - inode_group = (void *)-1 ; + }if (vfsmount_node) { vfsmount_mark =hlist_entry (srcu_dereference (vfsmount_node, &fsnotify_mark_srcu), struct fsnotify_mark, m.m_list); vfsmount_group = vfsmount_mark->group; - }else - vfsmount_group = (void *)-1 ; + } -if (inode_group < vfsmount_group) { +if (inode_group > vfsmount_group) {/* handle inode */ send_to_group (to_tell,NULL , inode_mark,NULL , mask, data, data_is, cookie, file_name, &event); used_inode = true; - }else if (vfsmount_group < inode_group) { + }else if (vfsmount_group > inode_group) {send_to_group (to_tell, mnt,NULL , vfsmount_mark, mask, data, data_is, cookie, file_name, &event); used_vfsmount = true;
Signature · 1 line
1.7.1
PATCH 2/2 fsnotify: drop two useless bools in the fnsotify main loop
The fsnotify main loop has 2 bools which indicated if we processed the inode or vfsmount mark in that particular pass through the loop. These bool can we replaced with the inode_group and vfsmount_group variables and actually make the code a little easier to understand.
--- fs/notify/fsnotify.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-)
fs/notify/fsnotify.c +5 -8
@@ -225,7 +225,6 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,struct fsnotify_event *event =NULL ;struct vfsmount *mnt;int idx, ret =0 ; -bool used_inode, used_vfsmount;/* global tests shouldn't care about events on child only the specific event */ __u32 test_mask = (mask & ~FS_EVENT_ON_CHILD );
@@ -260,7 +259,6 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is, }while (inode_node || vfsmount_node) { - used_inode = used_vfsmount = false; inode_group = vfsmount_group =NULL ;if (inode_node) {
@@ -279,23 +277,22 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,/* handle inode */ send_to_group (to_tell,NULL , inode_mark,NULL , mask, data, data_is, cookie, file_name, &event); - used_inode = true; +/* we didn't use the vfsmount_mark */ + vfsmount_group =NULL ; }else if (vfsmount_group > inode_group) {send_to_group (to_tell, mnt,NULL , vfsmount_mark, mask, data, data_is, cookie, file_name, &event); - used_vfsmount = true; + inode_group =NULL ; }else {send_to_group (to_tell, mnt, inode_mark, vfsmount_mark, mask, data, data_is, cookie, file_name, &event); - used_vfsmount = true; - used_inode = true; } -if (used_inode) +if (inode_group) inode_node =srcu_dereference (inode_node->next, &fsnotify_mark_srcu); -if (used_vfsmount) +if (vfsmount_group) vfsmount_node =srcu_dereference (vfsmount_node->next, &fsnotify_mark_srcu); }
Signature · 1 line
1.7.1