Merge "msm: kgsl: Add out of bound check for gmu register access" (a1428d49) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/msm/kgsl_gmu_core.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,11 @@ void gmu_core_regread(struct kgsl_device *device, unsigned int offsetwords,
		{
		struct gmu_core_ops *gmu_core_ops = GMU_CORE_OPS(device);

		if (!gmu_core_is_register_offset(device, offsetwords)) {
		WARN(1, "Out of bounds register read: 0x%x\n", offsetwords);
		return;
		}

		if (gmu_core_ops && gmu_core_ops->regread)
		gmu_core_ops->regread(device, offsetwords, value);
		else
		@@ -204,6 +209,11 @@ void gmu_core_regwrite(struct kgsl_device *device, unsigned int offsetwords,
		{
		struct gmu_core_ops *gmu_core_ops = GMU_CORE_OPS(device);

		if (!gmu_core_is_register_offset(device, offsetwords)) {
		WARN(1, "Out of bounds register write: 0x%x\n", offsetwords);
		return;
		}

		if (gmu_core_ops && gmu_core_ops->regwrite)
		gmu_core_ops->regwrite(device, offsetwords, value);
		}
		@@ -214,6 +224,11 @@ void gmu_core_regrmw(struct kgsl_device *device,
		{
		unsigned int val = 0;

		if (!gmu_core_is_register_offset(device, offsetwords)) {
		WARN(1, "Out of bounds register rmw: 0x%x\n", offsetwords);
		return;
		}

		gmu_core_regread(device, offsetwords, &val);
		val &= ~mask;
		gmu_core_regwrite(device, offsetwords, val \| bits);