From patchwork Tue Mar 21 18:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gokul krishna Krishnakumar X-Patchwork-Id: 72984 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1947861wrt; Tue, 21 Mar 2023 11:46:04 -0700 (PDT) X-Google-Smtp-Source: AK7set9aD5TodYeztS/mdXoE4fSeD9jQSRd75FclmPtxS0NmhvykQwGU5ipALq5R/VXwUYM73KPF X-Received: by 2002:a05:6a20:8b8f:b0:d9:c00a:82bc with SMTP id m15-20020a056a208b8f00b000d9c00a82bcmr3249640pzh.52.1679424364629; Tue, 21 Mar 2023 11:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679424364; cv=none; d=google.com; s=arc-20160816; b=yYzJs/t/D+mZl2eXWMfOsq6NcOfp65W6+wpPXa4Joq5uhi63qx2BX7594Dfkd3KH9H 3jbFjfQR2+snejo3UySX+g62UN0kBWwNblc6VURaKxD6PEK5+JY0l7rCnLWOu+uI6QZA h8vUtN5anOtaSwByNd4EcDIGchN0X0ZQseADHZ56cV1KruGyQj3kdrVZfC22vFU6VRQ/ 1qZgWeUgojYYtC4nq4wzFttHcNEFPasSXw+qRn4Jawt7OoSqx1Y+gUZZosdXPMwHC97k 9k9c37f4X+dvtHtb733/KKvLY8TI1DSS2nBNm2EbfzUJCRZiUf6LMjwVNGv+kb5jACNc ooUA== 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=N7rjdkk2VBnMhk+iF3Zl/KI4r7dcDpWPOfVT+/Bb/ko=; b=VZYra/N+XMfeTFqLx3G2zf1mkY+GCUWrGotYfMiwzlmo1+jy1oSAEQnsCHNQ6f1wqV gcCcbWZ3svyLS1dBfHTUh2Fi6PUrnxCL5fvfTAs5EGTsiW9eY2EROAaK6DESN/mdaPQv XHk8UhUE39SHqmJ47nzBhgaI6fzNZTpvY0DfOOa7wJHNisFOFeqIu9X7B00NZMXJDvFz uOo3Wek7wKjoAugDJQBqjreAtoN0CqKe8LWq8oh7IoIi/MdjYrYT6TsbXOZDlDIdToCe qNdStNvKhXAAFfSC4wVKVt16az72F36iW8yki6fM2SKsNpq8j/1H86gCGEWiDgJcmmoc 8o3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=fwAND6FW; 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 d21-20020a056a0024d500b0059338de4684si8250386pfv.255.2023.03.21.11.45.45; Tue, 21 Mar 2023 11:46:04 -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=fwAND6FW; 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 S229525AbjCUSdT (ORCPT + 99 others); Tue, 21 Mar 2023 14:33:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbjCUSdR (ORCPT ); Tue, 21 Mar 2023 14:33:17 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61F8EAD2C; Tue, 21 Mar 2023 11:33:14 -0700 (PDT) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32LGEj7o029939; Tue, 21 Mar 2023 18:33:05 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=N7rjdkk2VBnMhk+iF3Zl/KI4r7dcDpWPOfVT+/Bb/ko=; b=fwAND6FWzf5hpb/Tzr3X3bu/kf4/bbKbe/LdkhPPfoTibt0YsvrpwAf4LZIazhxFB1pQ /CuzxFVIvW3VWW9Do9MNjTBm2gqP29QggIvE2Cu1WwiA/wa/edR1iqBzv03fI6ALJrJE tjWmDiNqIQFJ6PfjYkHbTolaZXCn7q05NxZ1XQ7xhv8kTGf+mRiMWa+8jP+8avyMybnp bMgW4uxaIcbUKo/MIAaH2ibAvDQFePUYXNk2xkBw3vXz8BxjBwNCos1XcFMNaHA+7AM4 IgpDq+CdcULtX/hZ2pG/qOd3H5ZTS5NAEuFgdgAA2H0o72itvbIRMdYgb5aoYrNt21d0 oQ== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pfbjy9ayh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 18:33:05 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32LIX4fo023252 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 18:33:04 GMT Received: from hu-gokukris-sd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 21 Mar 2023 11:33:03 -0700 From: Gokul krishna Krishnakumar To: , , CC: Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Trilok Soni , "Satya Durga Srinivasu Prabhala" , Rajendra Nayak , Elliot Berman , "Guru Das Srinagesh" , Melody Olvera , Sibi Sankar , "Gokul krishna Krishnakumar" Subject: [PATCH v3 1/1] soc: qcom: mdt_loader: Enhance split binary detection Date: Tue, 21 Mar 2023 11:32:49 -0700 Message-ID: <20230321183249.24154-1-quic_gokukris@quicinc.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: gomtDVaNqWGXs04bpBSt_d-849-pxFzb X-Proofpoint-ORIG-GUID: gomtDVaNqWGXs04bpBSt_d-849-pxFzb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_11,2023-03-21_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210147 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759662422300219125?= X-GMAIL-MSGID: =?utf-8?q?1761004082734535236?= It may be that the offset of the first program header lies inside the mdt's filesize, in this case the loader would incorrectly assume that the bins were not split. The loading would then continue on to fail for split bins. This change updates the logic used by the mdt loader to understand whether the firmware images are split or not. It figures this out by checking if each programs header's segment lies within the file or not. Signed-off-by: Melody Olvera Signed-off-by: Gokul krishna Krishnakumar --- This patch is separated out from [1] and includes changes addressing comments from that patch set. [1] https://lore.kernel.org/all/20230306231202.12223-5-quic_molvera@quicinc.com/ --- drivers/soc/qcom/mdt_loader.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 3f11554df2f3..08ed4c0293f2 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -258,6 +258,26 @@ int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw, } EXPORT_SYMBOL_GPL(qcom_mdt_pas_init); +static bool qcom_mdt_bins_are_split(const struct firmware *fw, const char* fw_name) +{ + const struct elf32_phdr *phdrs; + const struct elf32_hdr *ehdr; + uint64_t seg_start, seg_end; + int i; + + ehdr = (struct elf32_hdr *)fw->data; + phdrs = (struct elf32_phdr *)(ehdr + 1); + + for (i = 0; i < ehdr->e_phnum; i++) { + seg_start = phdrs[i].p_offset; + seg_end = phdrs[i].p_offset + phdrs[i].p_filesz; + if (seg_start > fw->size || seg_end > fw->size) + return true; + } + + return false; +} + static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, const char *fw_name, int pas_id, void *mem_region, phys_addr_t mem_phys, size_t mem_size, @@ -270,6 +290,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, phys_addr_t min_addr = PHYS_ADDR_MAX; ssize_t offset; bool relocate = false; + bool is_split; void *ptr; int ret = 0; int i; @@ -277,6 +298,8 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, if (!fw || !mem_region || !mem_phys || !mem_size) return -EINVAL; + + is_split = qcom_mdt_bins_are_split(fw, fw_name); ehdr = (struct elf32_hdr *)fw->data; phdrs = (struct elf32_phdr *)(ehdr + 1); @@ -330,8 +353,8 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, ptr = mem_region + offset; - if (phdr->p_filesz && phdr->p_offset < fw->size && - phdr->p_offset + phdr->p_filesz <= fw->size) { + + if (phdr->p_filesz && !is_split) { /* Firmware is large enough to be non-split */ if (phdr->p_offset + phdr->p_filesz > fw->size) { dev_err(dev, "file %s segment %d would be truncated\n",