Merge "qdsp6v2: q6usm: Check size of payload before access" (ae4efa3c) · Commits · e / devices / android_kernel_sony_msm8998

drivers/misc/qcom/qdsp6v2/ultrasound/q6usm.c

+18 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, 2019, 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
		@@ -567,6 +567,11 @@ static int32_t q6usm_callback(struct apr_client_data data, void priv)
		}

		if (data->opcode == APR_BASIC_RSP_RESULT) {
		if (data->payload_size < (2 * sizeof(uint32_t))) {
		pr_err("%s: payload has invalid size[%d]\n", __func__,
		data->payload_size);
		return -EINVAL;
		}
		/* status field check */
		if (payload[1]) {
		pr_err("%s: wrong response[%d] on cmd [%d]\n",
		@@ -630,6 +635,12 @@ static int32_t q6usm_callback(struct apr_client_data data, void priv)

		opcode = Q6USM_EVENT_READ_DONE;
		spin_lock_irqsave(&port->dsp_lock, dsp_flags);
		if (data->payload_size <
		(sizeof(uint32_t)*(READDONE_IDX_STATUS + 1))) {
		pr_err("%s: Invalid payload size for READDONE[%d]\n",
		__func__, data->payload_size);
		return -EINVAL;
		}
		if (payload[READDONE_IDX_STATUS]) {
		pr_err("%s: wrong READDONE[%d]; token[%d]\n",
		__func__,
		@@ -675,6 +686,12 @@ static int32_t q6usm_callback(struct apr_client_data data, void priv)
		struct us_port_data *port = &usc->port[IN];

		opcode = Q6USM_EVENT_WRITE_DONE;
		if (data->payload_size <
		(sizeof(uint32_t)*(WRITEDONE_IDX_STATUS + 1))) {
		pr_err("%s: Invalid payload size for WRITEDONE[%d]\n",
		__func__, data->payload_size);
		return -EINVAL;
		}
		if (payload[WRITEDONE_IDX_STATUS]) {
		pr_err("%s: wrong WRITEDONE_IDX_STATUS[%d]\n",
		__func__,