dsp: bugfix for memory leak in error handling path (ff8d8d42) · Commits · e / devices / android_kernel_fairphone_FP5

Add extra goto label in order to free memory in case program failed to acquire memory through callback_node. With the original code, there might be a situation where the memory acquired by client_info_node will not be freed, thus causing possible memory leak. Change-Id: If5c8a4bdfbed4ada57a7563e9e212dc9aa7caab0 Signed-off-by:

Jinjuan Qiu <jinjqiu@codeaurora.org>

dsp/audio_calibration.c

100755 → 100644

+6 −3

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ int audio_cal_register(int num_cal_types,
		GFP_KERNEL);
		if (callback_node == NULL) {
		ret = -ENOMEM;
		goto err;
		goto err_callback_node;
		}

		memcpy(callback_node, &reg_data[i].callbacks,
		@@ -160,10 +160,13 @@ int audio_cal_register(int num_cal_types,
		&audio_cal.client_info[reg_data[i].cal_type]);
		mutex_unlock(&audio_cal.cal_mutex[reg_data[i].cal_type]);
		}
		done:
		return ret;
		goto done;

		err_callback_node:
		kfree(client_info_node);
		err:
		audio_cal_deregister(num_cal_types, reg_data);
		done:
		return ret;
		}