Merge "msm: ipa: Add parameters validation to handle static analysis issues" (e037764c) · Commits · e / devices / android_kernel_sony_msm8998

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,11 @@ static int ipahal_imm_cmd_init(enum ipa_hw_type ipa_hw_type)

		IPAHAL_DBG_LOW("Entry - HW_TYPE=%d\n", ipa_hw_type);

		if ((ipa_hw_type < 0) \|\| (ipa_hw_type >= IPA_HW_MAX)) {
		IPAHAL_ERR("invalid IPA HW type (%d)\n", ipa_hw_type);
		return -EINVAL;
		}

		memset(&zero_obj, 0, sizeof(zero_obj));
		for (i = IPA_HW_v3_0 ; i < ipa_hw_type ; i++) {
		for (j = 0; j < IPA_IMM_CMD_MAX ; j++) {
		@@ -901,6 +906,11 @@ static int ipahal_pkt_status_init(enum ipa_hw_type ipa_hw_type)

		IPAHAL_DBG_LOW("Entry - HW_TYPE=%d\n", ipa_hw_type);

		if ((ipa_hw_type < 0) \|\| (ipa_hw_type >= IPA_HW_MAX)) {
		IPAHAL_ERR("invalid IPA HW type (%d)\n", ipa_hw_type);
		return -EINVAL;
		}

		/*
		* Since structure alignment is implementation dependent,
		* add test to avoid different and incompatible data layouts.
		@@ -1269,6 +1279,12 @@ int ipahal_init(enum ipa_hw_type ipa_hw_type, void __iomem *base,
		goto bail_free_ctx;
		}

		if (ipa_hw_type >= IPA_HW_MAX) {
		IPAHAL_ERR("invalid IPA HW type (%d)\n", ipa_hw_type);
		result = -EINVAL;
		goto bail_free_ctx;
		}

		if (!base) {
		IPAHAL_ERR("invalid memory io mapping addr\n");
		result = -EINVAL;

+5 −0

Original line number	Diff line number	Diff line
		@@ -1066,6 +1066,11 @@ int ipahal_reg_init(enum ipa_hw_type ipa_hw_type)

		IPAHAL_DBG_LOW("Entry - HW_TYPE=%d\n", ipa_hw_type);

		if ((ipa_hw_type < 0) \|\| (ipa_hw_type >= IPA_HW_MAX)) {
		IPAHAL_ERR("invalid IPA HW type (%d)\n", ipa_hw_type);
		return -EINVAL;
		}

		memset(&zero_obj, 0, sizeof(zero_obj));
		for (i = IPA_HW_v3_0 ; i < ipa_hw_type ; i++) {
		for (j = 0; j < IPA_REG_MAX ; j++) {