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

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>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index c4f4d761631..cdbb56edb6c 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -181,7 +181,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
         /* If all slots are taken -- bail out. */
         if (uvfb_tasks[seq]) {
                 mutex_unlock(&uvfb_lock);
-                return -EBUSY;
+                err = -EBUSY;
+                goto out;
         }
 
         /* 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());
                 }
         }
-        kfree(m);
 
         if (!err && !(task->t.flags & TF_EXIT))
                 err = !wait_for_completion_timeout(task->done,
@@ -218,7 +218,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
         seq++;
         if (seq >= UVESAFB_TASKS_MAX)
                 seq = 0;
-
+out:
+        kfree(m);
         return err;
 }