summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-11-23 23:48:26 -0500
committerEric Paris <eparis@redhat.com>2010-12-07 16:14:23 -0500
commit26379198937fcc9bbe7be76be695d06df8334eaa (patch)
tree47be9bc5b202f5f5e1a94a08966d362787bb06ea
parenta2ae4cc9a16e211c8a128ba10d22a85431f093ab (diff)
downloadop-kernel-dev-26379198937fcc9bbe7be76be695d06df8334eaa.zip
op-kernel-dev-26379198937fcc9bbe7be76be695d06df8334eaa.tar.gz
fanotify: do not leak user reference on allocation failure
If fanotify_init is unable to allocate a new fsnotify group it will return but will not drop its reference on the associated user struct. Drop that reference on error. Reported-by: Vegard Nossum <vegard.nossum@gmail.com> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--fs/notify/fanotify/fanotify_user.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 01fffe6..ca54957 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -692,8 +692,10 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
/* fsnotify_alloc_group takes a ref. Dropped in fanotify_release */
group = fsnotify_alloc_group(&fanotify_fsnotify_ops);
- if (IS_ERR(group))
+ if (IS_ERR(group)) {
+ free_uid(user);
return PTR_ERR(group);
+ }
group->fanotify_data.user = user;
atomic_inc(&user->fanotify_listeners);
OpenPOWER on IntegriCloud