From patchwork Tue May 9 00:18:21 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: 91321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2523718vqo; Mon, 8 May 2023 17:29:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ56kE3yjit598atUjJr6gq8/z2BojfV4lTAf786d5uSe2d3GHodmKwcUSvvtT2SYKpoqckO X-Received: by 2002:a05:6a00:1907:b0:643:b081:3428 with SMTP id y7-20020a056a00190700b00643b0813428mr13964747pfi.27.1683592162208; Mon, 08 May 2023 17:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683592162; cv=none; d=google.com; s=arc-20160816; b=OlQydgNRe0dxOEN2SoEN2izv+4G+Zn5volbFu1a/6fjjrpiALGy97Z0BCmlEabmrG2 vgv8It4igYVoVmWul0i43DQuGIt6zFCIp4JgSpFosW5wW874f8ZxA7sFyDLCop8oPHEp PGTmkvpMGhtbWFSsI/+WTJyncwdXzheohf4HNOVpMO4z2nyldYZuVWyaGGW7z3vH+V1F eO7v/f0CY5haMjrH9l1MIxKtg/N0jFJcyZO4Jl2QGs+n1FiepQ3r8WUQcetga3HYO5NY jLGRG8kGVsYJ9/A/uSqY0PMSEYzh0ANcBOOYyes7w/xGsdbF0Qgyfu/f964n0HFQrxQ2 XznQ== 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=cbNc63OdKgM2YxbA0LfEgCDznvKGSI28JVDUPdeQrVI=; b=h2Oca+vJiyrf81JntOVQ3nCE6KTm2gph8pDGtOpkxEoBE53lkV6OzAcESSYk1YBC1/ cf2wMP1adtSlsg8Y5rRO0l0rMY+TOAUa0fAGWrKx8uA8A89wOJSnn9asu5Qw50cAGg7A 8bNBLvvuHK8KP67z8KfKCiWHypd/HhpVsHuCRE0zBu9QpEMmttkeH9zGAXkKkq1BsUSv CpqB/jJi70rHtGeg5YZLL/yVj5U6K6oKLIiktjOV+PMH7n4yH1b/zJ55H9PTgIneahJl 5KdZqRKfI4FTBRX4wcl/9Pz+WjsGCIaFGWZgFXk9hcjH1SI9ctURxlvgIQN810XdNlEE cWaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=i06mRJcm; 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 k12-20020aa79d0c000000b0063b71d46b6dsi1114651pfp.75.2023.05.08.17.29.08; Mon, 08 May 2023 17:29:22 -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=i06mRJcm; 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 S234134AbjEIASm (ORCPT + 99 others); Mon, 8 May 2023 20:18:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjEIASl (ORCPT ); Mon, 8 May 2023 20:18:41 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A77D40FD; Mon, 8 May 2023 17:18:40 -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 3490CXJc006550; Tue, 9 May 2023 00:18:37 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=cbNc63OdKgM2YxbA0LfEgCDznvKGSI28JVDUPdeQrVI=; b=i06mRJcm7bp7vLIVwSrX0mewhGFvGBDA/0k9R6ixlxiqJeo0ZbEj0UYA01hR14pdJXcr +O/qQRyDr7P4msnp6lvs71hO4oYzAPupeip6IqpNK/PX+Fx9aL1RCazKBLJm0oBl04SV kTo1kXpr0LLqC5JwpxQfhShiad4zI4ENZikIBRKlrnHXNWxEAYdHDd3aYj8RmFoXAvt7 /Z012oA24xYsMkn/sA4pjns1wMFQzpKn30zb5SX9OS85+SJ4wLnrcLlroov3CFMeWU7x oY9ARscDUbENqf2riLXGQQ3PT0Azq2haWA3t61jG0uUiegOpChxwdmlB3T0Esw/kMhnN XQ== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qf77f0dds-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 May 2023 00:18:37 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3490Ia5R001722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 May 2023 00:18:36 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.42; Mon, 8 May 2023 17:18:35 -0700 From: Gokul krishna Krishnakumar To: CC: Andy Gross , Bjorn Andersson , Konrad Dybcio , , , Trilok Soni , "Satya Durga Srinivasu Prabhala" , Rajendra Nayak , Elliot Berman , "Guru Das Srinagesh" , Sibi Sankar , Melody Olvera , Gokul krishna Krishnakumar Subject: [PATCH v6 1/1] soc: qcom: mdt_loader: Enhance split binary detection Date: Mon, 8 May 2023 17:18:21 -0700 Message-ID: <20230509001821.24010-1-quic_gokukris@quicinc.com> X-Mailer: git-send-email 2.40.1 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-ORIG-GUID: WdvYaK6GtPYgaCsNxJrMc8Z4an6glUkd X-Proofpoint-GUID: WdvYaK6GtPYgaCsNxJrMc8Z4an6glUkd 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-05-08_18,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 adultscore=0 impostorscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305090000 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765374335114702217?= X-GMAIL-MSGID: =?utf-8?q?1765374335114702217?= 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 and in this scenario the firmware authentication fails. 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. Co-developed-by: Melody Olvera Signed-off-by: Melody Olvera Signed-off-by: Gokul krishna Krishnakumar --- V6: Fixed format error in qcom_mdt_bins_are_split function definition and Correcting the s-o-b by keeping Melody as the co-developer. V5: Removes extra empty lines from V4 and fixed the S-o-b by keeping Melody's name first. V4: Change the commit text to include the scenario in which we see the problem. V3: separated out from [1] and includes changes addressing comments from that patch set: 1. Change the checking condition for non-split firmwares to (phr->p_filesz && !issplit) on line #352 for better readability. 2. Removes an unncecessary check for split bins in qcom_mdt_read_metadata()/ [1] https://lore.kernel.org/all/20230306231202.12223-5-quic_molvera@quicinc.com/ --- drivers/soc/qcom/mdt_loader.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 3f11554df2f3..0e35d29b4438 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,7 @@ 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 +352,7 @@ 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",