Merge "soc: qcom: Add check to handle out of bound access" (4ae170e1) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/msm_minidump.c

+16 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2018,2020 The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018,2020-2021, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "Minidump: " fmt
		@@ -232,6 +232,7 @@ EXPORT_SYMBOL(msm_minidump_update_region);
		int msm_minidump_add_region(const struct md_region *entry)
		{
		u32 entries;
		u32 toc_init;
		struct md_region *mdr;

		if (validate_region(entry))
		@@ -251,6 +252,19 @@ int msm_minidump_add_region(const struct md_region *entry)
		return -ENOMEM;
		}

		toc_init = 0;
		if (minidump_table.md_ss_toc &&
		(minidump_table.md_ss_toc->md_ss_enable_status ==
		MD_SS_ENABLED)) {
		toc_init = 1;
		if (minidump_table.md_ss_toc->ss_region_count >=
		MAX_NUM_ENTRIES) {
		spin_unlock(&mdt_lock);
		pr_err("Maximum regions in minidump table reached.\n");
		return -ENOMEM;
		}
		}

		mdr = &minidump_table.entry[entries];
		strlcpy(mdr->name, entry->name, sizeof(mdr->name));
		mdr->virt_addr = entry->virt_addr;
		@@ -260,9 +274,7 @@ int msm_minidump_add_region(const struct md_region *entry)

		minidump_table.num_regions = entries + 1;

		if (minidump_table.md_ss_toc &&
		(minidump_table.md_ss_toc->md_ss_enable_status ==
		MD_SS_ENABLED))
		if (toc_init)
		md_update_ss_toc(entry);
		else
		pendings++;