evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/video/uvesafb.c: fix error-path memory leak

Browse source 
Fix bug identified by Daniel Marjamki: `m' is leaked on the error path.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10452

Cc: Daniel Marjamki <danielm77@spray.se>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2008-04-28 02:15:41 -07:00 • committed by Linus Torvalds
parent 0e27aa3dab
commit 60c1645dfa
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/uvesafb.c
View file

@ -181,7 +181,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
/* If all slots are taken -- bail out. */ /* If all slots are taken -- bail out. */
if (uvfb_tasks[seq]) { if (uvfb_tasks[seq]) {
mutex_unlock(&uvfb_lock); mutex_unlock(&uvfb_lock);
return -EBUSY; err = -EBUSY;
goto out;
} }
/* Save a pointer to the kernel part of the task struct. */ /* Save a pointer to the kernel part of the task struct. */
@ -205,7 +206,6 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
err = cn_netlink_send(m, 0, gfp_any()); err = cn_netlink_send(m, 0, gfp_any());
} }
} }
kfree(m);
if (!err && !(task->t.flags & TF_EXIT)) if (!err && !(task->t.flags & TF_EXIT))
err = !wait_for_completion_timeout(task->done, err = !wait_for_completion_timeout(task->done,
@ -218,7 +218,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
seq++; seq++;
if (seq >= UVESAFB_TASKS_MAX) if (seq >= UVESAFB_TASKS_MAX)
seq = 0; seq = 0;
out:
kfree(m);
return err; return err;
} }