diff options
author | ZhangXiaoxu <zhangxiaoxu5@huawei.com> | 2019-03-01 20:17:32 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2019-03-11 05:13:17 -0400 |
commit | 62c9d2674b31d4c8a674bee86b7edc6da2803aea (patch) | |
tree | 749addcfc56de7c36293ec2df114724d73274925 /fs/notify | |
parent | 12ad143e1b803e541e48b8ba40f550250259ecdd (diff) |
inotify: Fix fsnotify_mark refcount leak in inotify_update_existing_watch()
Commit 4d97f7d53da7dc83 ("inotify: Add flag IN_MASK_CREATE for
inotify_add_watch()") forgot to call fsnotify_put_mark() with
IN_MASK_CREATE after fsnotify_find_mark()
Fixes: 4d97f7d53da7dc83 ("inotify: Add flag IN_MASK_CREATE for inotify_add_watch()")
Signed-off-by: ZhangXiaoxu <zhangxiaoxu5@huawei.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify')
-rw-r--r-- | fs/notify/inotify/inotify_user.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index e2901fbb9f76..7b53598c8804 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
@@ -519,8 +519,10 @@ static int inotify_update_existing_watch(struct fsnotify_group *group, | |||
519 | fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group); | 519 | fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group); |
520 | if (!fsn_mark) | 520 | if (!fsn_mark) |
521 | return -ENOENT; | 521 | return -ENOENT; |
522 | else if (create) | 522 | else if (create) { |
523 | return -EEXIST; | 523 | ret = -EEXIST; |
524 | goto out; | ||
525 | } | ||
524 | 526 | ||
525 | i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark); | 527 | i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark); |
526 | 528 | ||
@@ -548,6 +550,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group, | |||
548 | /* return the wd */ | 550 | /* return the wd */ |
549 | ret = i_mark->wd; | 551 | ret = i_mark->wd; |
550 | 552 | ||
553 | out: | ||
551 | /* match the get from fsnotify_find_mark() */ | 554 | /* match the get from fsnotify_find_mark() */ |
552 | fsnotify_put_mark(fsn_mark); | 555 | fsnotify_put_mark(fsn_mark); |
553 | 556 | ||