Skip to contentSkip to conversation

notification updates for 2.6.34-rcX

GIT PULL Eric Paris 2 participants 3 messages May 14, 2010

lore
Share & tools
lore

Eric Paris

author
#0 lore raw

This branch holds a couple of bug fixes (two of which are actually stable material). A pathological race which would put us in a use after free / double free situation when one thread attempts to delete an inotify watch while another thread is still adding that watch. A memory leak and a Kconfig issue.

Thanks
-Eric

The following changes since commit 6a251b0ab67989f468f4cb65179e0cf40cf8c295:
Linus Torvalds (1):

        Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6

are available in the git repository at:

git://git.infradead.org/users/eparis/notify.git for-linus

Eric Paris (2):
inotify: clean up the inotify_add_watch out path
inotify: race use after free/double free in inotify inode marks

Pavel Emelyanov (1):
inotify: don't leak user struct on inotify release

Russell King (1):
Inotify: undefined reference to `anon_inode_getfd'

 fs/notify/inotify/Kconfig            |    1 +
 fs/notify/inotify/inotify_fsnotify.c |    2 ++
 fs/notify/inotify/inotify_user.c     |   16 ++++++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)
#1 lore raw
Quoted 3 lines · Eric Paris

Russell King (1):
Inotify: undefined reference to `anon_inode_getfd'

This one was bogus - it was already done in mainline _and_ in the tree you were applying the patch on.

I did a manual merge to edit out the duplicate Kconfig line.

Linus

author
#2 lore raw
Quoted 10 lines · Linus Torvalds
Quoted 3 lines · Eric Paris

Russell King (1):
Inotify: undefined reference to `anon_inode_getfd'

This one was bogus - it was already done in mainline _and_ in the tree you were applying the patch on.

I did a manual merge to edit out the duplicate Kconfig line.

I think I'm about 0/12 on pull requests......

/me crawls back into hiding.