From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info.patch added to -mm tree Date: Wed, 07 Jul 2010 16:44:02 -0700 Message-ID: <201007072344.o67Ni2Ba001354@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:35719 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758088Ab0GGXoz (ORCPT ); Wed, 7 Jul 2010 19:44:55 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: axel.lin@gmail.com, corentincj@iksaif.net, len.brown@intel.com, mjg@redhat.com, sziwan@users.sourceforge.net The patch titled asus_acpi: fix a memory leak in asus_hotk_get_info() has been added to the -mm tree. Its filename is asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: asus_acpi: fix a memory leak in asus_hotk_get_info() From: Axel Lin 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 Cc: Corentin Chary Cc: Karol Kozimor Cc: Matthew Garrett Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/platform/x86/asus_acpi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN drivers/platform/x86/asus_acpi.c~asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info drivers/platform/x86/asus_acpi.c --- a/drivers/platform/x86/asus_acpi.c~asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info +++ a/drivers/platform/x86/asus_acpi.c @@ -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); @@ -1374,7 +1375,7 @@ static int asus_hotk_get_info(void) kfree(model); - return AE_OK; + return 0; } static int asus_hotk_check(void) _ Patches currently in -mm which might be from axel.lin@gmail.com are linux-next.patch hp-wmi-return-enodev-if-bios-does-not-export-any-supported-hp-wmi-guid.patch fujitsu-laptop-remove-unnecessary-input_free_device-calls.patch compal-laptop-fujitsu-laptop-msi-laptop-make-dmi_check_cb-to-return-1-instead-of-0.patch asus_acpi-fix-a-memory-leak-in-asus_hotk_get_info.patch asus_acpi-fix-coding-style-to-improve-readability.patch intel_menlow-fix-memory-leaks-in-error-path-fix.patch drivers-video-backlight-s6e63m0c-set-permissions-on-gamma_table-file-to-0444.patch