From patchwork Tue Aug 1 06:47:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Praveenkumar I X-Patchwork-Id: 129041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2491069vqg; Tue, 1 Aug 2023 00:05:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGa134i8FkX1SbLgHHQBa56uoYHvS+6SmWzHnXOXl7xCM2CJE9pWHV9hlFSuxRNlGuqGL6 X-Received: by 2002:a17:906:108f:b0:993:e752:1a6d with SMTP id u15-20020a170906108f00b00993e7521a6dmr1801324eju.18.1690873505108; Tue, 01 Aug 2023 00:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690873505; cv=none; d=google.com; s=arc-20160816; b=b2GRmsUAR9Uun7lA2LPuW1+nhHxUiIxob8H7YIoCexp16SkWfTSnO7JTwmQ+m6TZvO vk62AY8oYFr/o3MLRXef4Us5U1ZHTqwbCAPJzIssnHTcAbktj1RTyS9iNYmb9eGiJxle TOMQ8UnNFcSImDKrWPL+ccIn1N+wI2GCajYQueuusZi6xNkEWNiC6UbPCiXT+jL91VIH Syl2aG2mtNqLPook8ufCkRtnhJ2OYqXD8YP5nG377K1YUcdiqstoMr7rsLiSpXNBNyd2 3YQQYyfPC8KEzsZlJDqMIR4QeQupRASP+BNaAr4QS8Y6RRJ7GCbfmF0EEIFMAQbH+8cy 7OEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=QV4vqHuRpxcN0wlOQI2I9Vr6uvqf0Q7mXfqtt31NXWI=; fh=GFG9x11eFw387+mJbY+aIEkm7e3Uw3AO3q21QG3gGlY=; b=CEniy6doSbXSp6UIumM0qIPzEFKfe00w0bSRbIz7J4b5qsNtlW4dS3ndHy6CklfCeN Oawd79YQlDLAJvevOX4ikIC5VAcN/KbS9OZ0kB/lHMjl5Pfb2dAFgLTeJBfXsbxrP1CC rqDkSHEeXMqcdbkj+ehOYuqSof6JvSEqlLRDWLGM7AB1r7L0nM+E96ri1XdKRSX5Bm8H qOGIZvLMi1f6m04R36b7ds81SCS8sYDBJdNDJsXZCeqOoR/W9ofRVnCM9sK/BzeW3U4u fJCpfwjP4l7xkAf3XSWlOcj9Hqilhfp2R7UPkoHRPKmSfSJDu06oPriJz6e905qu4LGW 36Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=cfklhD+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h20-20020a170906591400b0098dc18c13f4si8683105ejq.1037.2023.08.01.00.04.41; Tue, 01 Aug 2023 00:05:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=cfklhD+I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231913AbjHAGre (ORCPT + 99 others); Tue, 1 Aug 2023 02:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230190AbjHAGrb (ORCPT ); Tue, 1 Aug 2023 02:47:31 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FAB598; Mon, 31 Jul 2023 23:47:29 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3716I5mm018874; Tue, 1 Aug 2023 06:47:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=QV4vqHuRpxcN0wlOQI2I9Vr6uvqf0Q7mXfqtt31NXWI=; b=cfklhD+IOHaY4NRSrF5U948Vcz9c+5c8fI/TVrSIKJC5kEIriZ2YE0Ng5YCxdo3+tkj9 enMeDeQX0uxKSM0uQxKBy6dk2VmZGsheuQZc+rJI709cOlAVDX7X++qHqp/2mvBDGXdR fK3UMLJSz25V/8jK/O06RFVxkrc62GsxFz/HpnzyPMa0iJG2zdN/vyS0J8Zb8MalkIzH YqMZwpAoTythCHxK9c1R0LthcQyAJNNnrMlbjH1TYHuRhTGafSBAUi74CZDZLTT5KYDm Pjp5o0rsKiL7KWXUix/SzQoUSUvtLf+PjYGHaVe67itdtzoebEpxxLkT0PGdZolHCV9/ KA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s6d61jcwf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Aug 2023 06:47:26 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3716lPpw030188 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 1 Aug 2023 06:47:25 GMT Received: from hu-ipkumar-blr.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Mon, 31 Jul 2023 23:47:22 -0700 From: Praveenkumar I To: , , , , CC: , Subject: [PATCH v3] soc: qcom: qmi_encdec: Restrict string length in decode Date: Tue, 1 Aug 2023 12:17:12 +0530 Message-ID: <20230801064712.3590128-1-quic_ipkumar@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: ockZpWMMt-3_LtU9gahh4KkhiUaV1FQd X-Proofpoint-ORIG-GUID: ockZpWMMt-3_LtU9gahh4KkhiUaV1FQd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-01_03,2023-07-31_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 adultscore=0 suspectscore=0 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 clxscore=1015 malwarescore=0 priorityscore=1501 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308010061 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773009376313725793 X-GMAIL-MSGID: 1773009376313725793 From: Chris Lew 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 Signed-off-by: Praveenkumar I --- [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) {