Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d47bb5b2 authored by Axel Lin's avatar Axel Lin Committed by Matthew Garrett
Browse files

asus_acpi: fix a memory leak in asus_hotk_get_info() 



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: default avatarAxel 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 80183a4b

drivers/platform/x86/asus_acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -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)