From patchwork Mon Oct 11 13:45:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515609 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4459873ime; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz07R5GNxo7x44Q3Yxs0go2vmf1nHXqIMMiub25LZhTC0FDNwHrRLOEokoPChYn0x9JtxIK X-Received: by 2002:a17:90a:b117:: with SMTP id z23mr14900837pjq.74.1633960158122; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960158; cv=none; d=google.com; s=arc-20160816; b=xSpzAczG1Fq4Ut0bxpuCDs117hOKE1tB8KmJSexqXl1jClGA+zeEBfbnLnln91CWwu /XLRTELswgAH8daxztOK+eYWICbN8lSbDoYP0Re4awqLRe6cYaGNicZLMbyqLkksw/FH FEEt8JWfGDQTADHMD34EDh9Mrtmef04OpAbkc66OuP97oSS+6L46EjBicdE7cyv3RHV9 +zjGUHMtdzvMv25DMQU92BkVNabvGU8aREtxJuIziV12N2HKA+t10RCKLU0x81EYCf6L ikZp/ZfyVmIUvt+in8XxbI/mX3EGEhhuCsC28sK55431EG65RY3HBeqg/LxKUE/gkbnt RGWA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=55OBnEyr6APERzhIulQ+OwuOO3gX/H/0j2j5ZkCt91E=; b=yok3n9XZd0LkHfiq8HX8OmI/hUCymShjdElbQs0swoFY8W7wrqI+qKyponk1NTyjNw zq+UZehmmksvR2duO22EP/SQrgP/w6pkrOfQ00LfnsxP8o0IBVXuZV0JgG2ImVrrr/Vw wIiiuluEd59e5u+c3WZFiM7kzcUAJD1aTwycAwwg0CIRMKX5XScge6KMf5MIBX5Dps1t p5crTMzrcxRLSnhBU2nyCRDshbELP9MYNFNBmW8qw6Il5mSp2m6OG2fezhihzQQnDbTj zHnVkFI3pP9UNntaaUQNwjcbbP/4OjojwGk2YAmlFFF/ifDJb/zt+rCUJg2fIGiEtFnO jP3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KAOTO1Uy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si10383736pgi.568.2021.10.11.06.49.17; Mon, 11 Oct 2021 06:49:18 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KAOTO1Uy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237391AbhJKNvQ (ORCPT + 11 others); Mon, 11 Oct 2021 09:51:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:38572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236249AbhJKNuD (ORCPT ); Mon, 11 Oct 2021 09:50:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 349E460C49; Mon, 11 Oct 2021 13:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960082; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KAOTO1UyIYzWXHc7AunJKD7Acei4qglXqHvYFk+UCRxhRF+b8xPqGF43jvfWq+9xf k8iqYO8ku7f095tB4G6u9x1jFcMhbWGofEsodjjVM/6LA+AoSQEDCg3B4f66KQ5h+V M3JS240KQ18uc1GBtP7/xaTKJ2iQRrBx6aZwlzno= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Marijn Suijten , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.4 17/52] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:46 +0200 Message-Id: <20211011134504.297813804@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134503.715740503@linuxfoundation.org> References: <20211011134503.715740503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ Upstream commit 833d51d7c66d6708abbc02398892b96b950167b9 ] PT_LOAD type denotes that the segment should be loaded into the final firmware memory region. Hash segment is not one such, because it's only needed for PAS init and shouldn't be in the final firmware memory region. That's why mdt_phdr_valid() explicitly reject non PT_LOAD segment and hash segment. This actually makes the hash segment type check in qcom_mdt_read_metadata() unnecessary and redundant. For a hash segment, it won't be loaded into firmware memory region anyway, due to the QCOM_MDT_TYPE_HASH check in mdt_phdr_valid(), even if it has a PT_LOAD type for some reason (misusing or abusing?). Some firmware files on Sony phones are such examples, e.g WCNSS firmware of Sony Xperia M4 Aqua phone. The type of hash segment is just PT_LOAD. Drop the unnecessary hash segment type check in qcom_mdt_read_metadata() to fix firmware loading failure on these phones, while hash segment is still kept away from the final firmware memory region. Fixes: 498b98e93900 ("soc: qcom: mdt_loader: Support loading non-split images") Signed-off-by: Shawn Guo Reviewed-by: Marijn Suijten Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20210828070202.7033-1-shawn.guo@linaro.org Signed-off-by: Sasha Levin --- drivers/soc/qcom/mdt_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.33.0 diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index eba7f76f9d61..6034cd8992b0 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -98,7 +98,7 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len) if (ehdr->e_phnum < 2) return ERR_PTR(-EINVAL); - if (phdrs[0].p_type == PT_LOAD || phdrs[1].p_type == PT_LOAD) + if (phdrs[0].p_type == PT_LOAD) return ERR_PTR(-EINVAL); if ((phdrs[1].p_flags & QCOM_MDT_TYPE_MASK) != QCOM_MDT_TYPE_HASH)