Merge "msm: ipa: dynamic memory leak fix" (db353e2b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/ipa/ipa_v2/ipa_uc_wdi.c

+5 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -581,7 +581,8 @@ static void ipa_save_uc_smmu_mapping_pa(int res_idx, phys_addr_t pa,
		{
		IPADBG("--res_idx=%d pa=0x%pa iova=0x%lx sz=0x%zx\n", res_idx,
		&pa, iova, len);
		wdi_res[res_idx].res = kzalloc(sizeof(struct ipa_wdi_res), GFP_KERNEL);
		wdi_res[res_idx].res = kzalloc(sizeof(*wdi_res[res_idx].res),
		GFP_KERNEL);
		if (!wdi_res[res_idx].res)
		BUG();
		wdi_res[res_idx].nents = 1;
		@@ -607,8 +608,8 @@ static void ipa_save_uc_smmu_mapping_sgt(int res_idx, struct sg_table *sgt,
		return;
		}

		wdi_res[res_idx].res = kcalloc(sgt->nents, sizeof(struct ipa_wdi_res),
		GFP_KERNEL);
		wdi_res[res_idx].res = kcalloc(sgt->nents,
		sizeof(*wdi_res[res_idx].res), GFP_KERNEL);
		if (!wdi_res[res_idx].res)
		BUG();
		wdi_res[res_idx].nents = sgt->nents;