* [PATCH v3] soc: qcom: qmi_encdec: Restrict string length in decode
@ 2023-08-01 6:47 Praveenkumar I
2023-08-03 16:38 ` Bjorn Andersson
0 siblings, 1 reply; 2+ messages in thread
From: Praveenkumar I @ 2023-08-01 6:47 UTC (permalink / raw)
To: agross, andersson, konrad.dybcio, linux-arm-msm, linux-kernel
Cc: quic_varada, quic_clew
From: Chris Lew <quic_clew@quicinc.com>
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: 9b8a11e82615 ("soc: qcom: Introduce QMI encoder/decoder")
Cc: stable@vger.kernel.org
Signed-off-by: Chris Lew <quic_clew@quicinc.com>
Signed-off-by: Praveenkumar I <quic_ipkumar@quicinc.com>
---
[v2]:
Changed the Author name
[v2]:
Added Fixes and Cc: stable
drivers/soc/qcom/qmi_encdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/soc/qcom/qmi_encdec.c b/drivers/soc/qcom/qmi_encdec.c
index b7158e3c3a0b..5c7161b18b72 100644
--- a/drivers/soc/qcom/qmi_encdec.c
+++ b/drivers/soc/qcom/qmi_encdec.c
@@ -534,8 +534,8 @@ static int qmi_decode_string_elem(const 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) {
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] soc: qcom: qmi_encdec: Restrict string length in decode
2023-08-01 6:47 [PATCH v3] soc: qcom: qmi_encdec: Restrict string length in decode Praveenkumar I
@ 2023-08-03 16:38 ` Bjorn Andersson
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Andersson @ 2023-08-03 16:38 UTC (permalink / raw)
To: agross, konrad.dybcio, linux-arm-msm, linux-kernel, Praveenkumar I
Cc: quic_varada, quic_clew
On Tue, 01 Aug 2023 12:17:12 +0530, Praveenkumar I wrote:
> 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.
>
>
Applied, thanks!
[1/1] soc: qcom: qmi_encdec: Restrict string length in decode
commit: 8d207400fd6b79c92aeb2f33bb79f62dff904ea2
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-03 16:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-01 6:47 [PATCH v3] soc: qcom: qmi_encdec: Restrict string length in decode Praveenkumar I
2023-08-03 16:38 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).