From patchwork Mon Oct 11 13:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 515611 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4463277ime; Mon, 11 Oct 2021 06:53:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKxjla1A8jTD4mtnI4PbUpVW0VWXiW9A2SE+iGAge+i5LF3GT06T93bMuUOe6CXrN4dgmW X-Received: by 2002:a62:6541:0:b0:44c:2988:7d9d with SMTP id z62-20020a626541000000b0044c29887d9dmr25701570pfb.50.1633960427160; Mon, 11 Oct 2021 06:53:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633960427; cv=none; d=google.com; s=arc-20160816; b=KiN2xOUwAukSaMri7iZ4QGiNJqjzqQM5ofU8Nav0gQ1ncM+16Fk3ekSJUlo5nQ78vj 3GQHb6ojPnRfuSgABzvw1nBaPvypMk5w6RHBFqPcTViAcd66GufelcN/7Xd/ynuNdA8n AcNsXdMSTscsL9y1O8bjLfvgJ+c5C+WE5QGK4ghsK4o0XFWmdUDTuFoaLaAL930o0J5P hvqvjfhAKGjsONt23PzQ+xmD3Zr+/Y7lzqRMLLDP0J9wYZNH9KMsjIdSDhpCbPLVOh7w QsJ4FEXkHeznfjpjwZCwE59IcCtqRUqiHO14r6jlTRezjDJ8tjlM0Y/OAhzBRHzHGB9t bioQ== 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=IY8ILXBryJlshB1jknNAUgF/SZUBR3lC9y1yd3jbKhr8vqOqL7Wk20ixwoFjf6ktGl PuqUg9Giu+zD7uIa9bps7oKidhKzkZXKFE3RXCh4HZF+Sne6yQPUdyqlLUMpoKEdr9QL 6dzUWtJVphtyy63tax0PAdgQ1CxfKbPvsUWnPxtKAvLjo4SDzyjbUYkvFWdcDygzHprp KpMTlY4AvaRNyzCOq/zPpfrRmLi8Pf2JePgLVFgaQOgjusqBB0aZNpWdvY9kE8vdakU3 5+8QTYWbL9U5onM22fJsQ5KCLYwOSgPPaq+lvCDlLWfPIFVrymDPehHbxWvW7BG2PdYG q+7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iKuDDeIK; 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 v1si5806259pfb.272.2021.10.11.06.53.46; Mon, 11 Oct 2021 06:53:47 -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=iKuDDeIK; 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 S237575AbhJKNzq (ORCPT + 11 others); Mon, 11 Oct 2021 09:55:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:39898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237403AbhJKNxt (ORCPT ); Mon, 11 Oct 2021 09:53:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CD89560E8B; Mon, 11 Oct 2021 13:51:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960309; bh=KatlpQaVe2Tnj8+hKldMj+ZI/hitDdpstM/2v3SlcLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKuDDeIKAvFvidDG+WYEXnIquVBNsvKxX+LXu5HWQXB/o96vRiXjB2Iwj/H5+e/gw npFPrKJpDHCXA4+bxeIP5crTFEs35McKleOMWo+DNnd+8yIxaL0b/qm2NzUNKeNg9I cb+zDyZLfzihZRWYnOSKi05JbbDB7/ZHz6O/rOq8= 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.10 25/83] soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment Date: Mon, 11 Oct 2021 15:45:45 +0200 Message-Id: <20211011134509.230620469@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134508.362906295@linuxfoundation.org> References: <20211011134508.362906295@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)