From patchwork Mon Oct 11 13:45:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515620 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4474373ime; Mon, 11 Oct 2021 07:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVjVYUAPCrYXhFoesusJCJOeShWJ/7JXv/SpiEEmKbMsOvFPTztlxnex89NPWijDpmatVV X-Received: by 2002:a17:906:3859:: with SMTP id w25mr25976014ejc.550.1633961153574; Mon, 11 Oct 2021 07:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961153; cv=none; d=google.com; s=arc-20160816; b=YssGIZOyk9QNqW7LS0a00qj+fZ0jxW33vKha64oYc9NfmlKBI37fx7ljJ3qS2Zi7iI 9E71do0OdhtO5N1yzhXiHnVmWQobRAAkhJLHRCQ2surKT4kAsR/ZA3vTTCnSzpoVx59E 8wkOpoIa0xAG+VNe/0pCcZ2mEh2gO88/eFOqu6DCA5dG8VjKkIftWNWlJmjrTylPcvy1 Ix9PTXcnIF2SQfoQA0Fw3hzU61OB1+aD+0OaLLNOswtHX+btvVvPBmSJ0cJYiozIzMoP E/bKlkDzkJqRztsMwQVECTm47OspqgQ2J+WzVu3dRshj40Y0208fHM2Mc6W6ZPpVcRm6 q5Iw== 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=w5fc6R9Peo3iFRM0t/aC3ACJprqVBjER6P5U6r5VtRrEsBI/DvOISc5JfSqDD/iNqX A7oh+DZCTX3GfAHKEAyC7XN/vDoGkGa0usk2VJr2oclmTxIoFT3+qQKqPuL7amdAxEVA 4AXaUHy5olY3Ble0jBMoDGU/cIv7f2Unsl4L0eS+3IHCjk+kfujjsyUvPA00HZuvvL+K j10sbrqXJMcYi4Sh9WyxIv+brnKNy0KPij/VV2lRNqA2bKgV8/SzmC95eL8uoFHxVpmj neDJr2iORHzAXawGl0aV6JIo3q/E1TBy8M6aanuvWQJowODE8BqN0ogh6uZQy4TsuC9L yCzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FxLjYP+J; 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 x96si10422048ede.219.2021.10.11.07.05.53; Mon, 11 Oct 2021 07:05:53 -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=FxLjYP+J; 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 S238286AbhJKOHr (ORCPT + 11 others); Mon, 11 Oct 2021 10:07:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:56462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238214AbhJKOFk (ORCPT ); Mon, 11 Oct 2021 10:05:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0A0CC60F35; Mon, 11 Oct 2021 13:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960795; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FxLjYP+JhgpgP/5fujnopGtocmJFKcvL/yQxEEQ7bzSFHSsnsxF4Sn2nOHds0hBU5 pPo1RuOe+p/rGQNvAxvs2ZqtBefusCgsHcUf3LA5uySjxXyNGJ/UZ7hgGi3mN72+Vu OrmlUtl6e5Jk9SzifZdhepuWjMYLYhmzQFWzbCsQ= 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.14 042/151] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:14 +0200 Message-Id: <20211011134519.213747184@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@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)