Skip to content

Commit

Permalink
asus_acpi: fix a memory leak in asus_hotk_get_info()
Browse files Browse the repository at this point in the history
In the case of no match ( hotk->model == END_MODEL ), model sholud be
kfreed before return AE_OK.

This patch includes below fixes:

1. adds a missing kfree(model) before return AE_OK.

2. asus_hotk_get_info should return int, thus return 0 instead of AE_OK.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Karol Kozimor <sziwan@users.sourceforge.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Aug 3, 2010
1 parent 80183a4 commit d47bb5b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/platform/x86/asus_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,8 @@ static int asus_hotk_get_info(void)
return -ENODEV;
}
hotk->methods = &model_conf[hotk->model];
return AE_OK;
kfree(model);
return 0;
}
hotk->methods = &model_conf[hotk->model];
printk(KERN_NOTICE " %s model detected, supported\n", string);
Expand Down Expand Up @@ -1374,7 +1375,7 @@ static int asus_hotk_get_info(void)

kfree(model);

return AE_OK;
return 0;
}

static int asus_hotk_check(void)
Expand Down

0 comments on commit d47bb5b

Please sign in to comment.