Skip to contentSkip to conversation

fanotify use-after-free fixes

GIT PULL Jan Kara 1 participant 1 message Jan 29, 2014 VFS

lore
Share & tools
lore

Jan Kara

author reviewer
#0 lore raw

Hello Linus,

could you please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_linus

The pull contains three fixes for the fanotify use after free problems guys were reporting. I have ended up with different lifetime rules for struct fanotify_event_info depending on whether it is for permission event or normal event which isn't ideal. My plan is to split these into two different structures (as permission events need larger struct anyway) which will make the rules trivial again. But that can wait for later I guess (but I can add the patch to the pile if you want), now I wanted to make -rc1 boot for these guys.

Top of the tree is 85816794240b. The full shortlog is:

Jan Kara (3):
fanotify: Fix use after free in mask checking
fsnotify: Do not return merged event from fsnotify_add_notify_event()
fanotify: Fix use after free for permission events

The diffstat is

 fs/notify/fanotify/fanotify.c        | 40 ++++++++++++++++++------------------
 fs/notify/fanotify/fanotify.h        |  7 +++++++
 fs/notify/fanotify/fanotify_user.c   |  7 ++++++-
 fs/notify/inotify/inotify_fsnotify.c | 19 +++++++----------
 fs/notify/notification.c             | 24 +++++++++++-----------
 include/linux/fsnotify_backend.h     |  8 ++++----
 6 files changed, 56 insertions(+), 49 deletions(-)

Thanks
Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR