Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64c5e916 authored by Chris Lew's avatar Chris Lew Committed by Greg Kroah-Hartman
Browse files

soc: qcom: qmi_encdec: Restrict string length in decode 



commit 8d207400fd6b79c92aeb2f33bb79f62dff904ea2 upstream.

The QMI TLV value for strings in a lot of qmi element info structures
account for null terminated strings with MAX_LEN + 1. If a string is
actually MAX_LEN + 1 length, this will cause an out of bounds access
when the NULL character is appended in decoding.

Fixes: 9b8a11e8 ("soc: qcom: Introduce QMI encoder/decoder")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChris Lew <quic_clew@quicinc.com>
Signed-off-by: default avatarPraveenkumar I <quic_ipkumar@quicinc.com>
Link: https://lore.kernel.org/r/20230801064712.3590128-1-quic_ipkumar@quicinc.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c7608d9

drivers/soc/qcom/qmi_encdec.c

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ static int qmi_decode_string_elem(struct qmi_elem_info *ei_array, 
		decoded_bytes += rc;

	}



	if (string_len > temp_ei->elem_len) {

		pr_err("%s: String len %d > Max Len %d\n",

	if (string_len >= temp_ei->elem_len) {

		pr_err("%s: String len %d >= Max Len %d\n",

		       __func__, string_len, temp_ei->elem_len);

		return -ETOOSMALL;

	} else if (string_len > tlv_len) {