diff options
| author | Jan Kara <jack@suse.cz> | 2016-12-22 10:15:20 +0100 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2016-12-23 22:40:32 +0100 |
| commit | e3ba730702af370563f66cb610b71aa0ca67955e (patch) | |
| tree | 6a7dd8a17c9fde8851366f785faa4d9ce6462fe2 /fs/notify | |
| parent | audit: use proper refcount locking on audit_sock (diff) | |
| download | linux-e3ba730702af370563f66cb610b71aa0ca67955e.tar.xz linux-e3ba730702af370563f66cb610b71aa0ca67955e.zip | |
fsnotify: Remove fsnotify_duplicate_mark()
There are only two calls sites of fsnotify_duplicate_mark(). Those are
in kernel/audit_tree.c and both are bogus. Vfsmount pointer is unused
for audit tree, inode pointer and group gets set in
fsnotify_add_mark_locked() later anyway, mask and free_mark are already
set in alloc_chunk(). In fact, calling fsnotify_duplicate_mark() is
actively harmful because following fsnotify_add_mark_locked() will leak
group reference by overwriting the group pointer. So just remove the two
calls to fsnotify_duplicate_mark() and the function.
Signed-off-by: Jan Kara <jack@suse.cz>
[PM: line wrapping to fit in 80 chars]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'fs/notify')
| -rw-r--r-- | fs/notify/mark.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/notify/mark.c b/fs/notify/mark.c index d3fea0bd89e2..6043306e8e21 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c @@ -510,18 +510,6 @@ void fsnotify_detach_group_marks(struct fsnotify_group *group) } } -void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old) -{ - assert_spin_locked(&old->lock); - new->inode = old->inode; - new->mnt = old->mnt; - if (old->group) - fsnotify_get_group(old->group); - new->group = old->group; - new->mask = old->mask; - new->free_mark = old->free_mark; -} - /* * Nothing fancy, just initialize lists and locks and counters. */ |