From patchwork Wed May 12 14:45:24 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: 435652 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5117355jao; Wed, 12 May 2021 12:24:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfbB/CbQTLZbpVIP5nCLgeJ9rKc5w/JXW/qCFQjn8IeUkdSyp2m7Og6eAIdIylsro6EYo7 X-Received: by 2002:a05:6602:718:: with SMTP id f24mr26875715iox.59.1620847457484; Wed, 12 May 2021 12:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847457; cv=none; d=google.com; s=arc-20160816; b=h5Sw3wo03kOiWqFFo4mSM4E7kZg1N0msjZW6oj/ZCcghMUkn/7OaH99lsi2bu/c+sQ uk2MSsBDcr3xhU221QZ82NM4/fLIM/VNK1gnQiiCcVTMO3knozTztqC4H4tdJP0ieUuF Vfy0UD8IiR+m6emOkIgNjzPSY+zXnU4suZxI9dW4ZkeFmlWpSHdTyMRvjyk5K6u4z8yP /0lxIaYtSyM+1mr0/It+JTQ2m0KRfUVJIiG16wherbGV0MVl5CWhP4wkRKF1ozjHBOlF 8/5Znh8z0IPCwevTt+aS0DlkWVVq9K84de/2Vwre/XCRnlXJLTS4zN2m9qYcco4NbK0J 1vIw== 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=8x4Jc3kRfqn3ZKx7wTvf/HZd/MHoN4RWHsh4gs6KUmY=; b=T7n7qzvZRuCkVhziyx8Ex8X9DFk1R18LbtEd3YJDfISh9w8AOCtQ/B+DZPqhbVnNdv prDxuX21lcLB8a/yqUn4H0wCRfrzBTAhCPtd0NztJRWV1fo1N1OybITBEthRDN4lrJtS 5Pa+6pMJLx/dZ4Bk1iK3Bxx+WzcQFf/Z7hPf+1gW5ICNZQSsEGHju1e2PRh9OTJGvttt lC6f5p6riqXC65hGlrXBosgu7egy1IajykNSdUJJLx+Lyr9rJQ4T5g/IygXqKOBvP5q6 B9NoPrA71lDglr8bz5UE6TuJYBUANWHxXz+5pyeIbMak6ijrpi/sVWO6iwX4DxN/TEgK 7kIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Iil+1+0A; 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 q8si330223ior.12.2021.05.12.12.24.17; Wed, 12 May 2021 12:24:17 -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=Iil+1+0A; 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 S237989AbhELQn7 (ORCPT + 12 others); Wed, 12 May 2021 12:43:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:55764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243160AbhELQgz (ORCPT ); Wed, 12 May 2021 12:36:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 27BE061E18; Wed, 12 May 2021 16:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835272; bh=Vzc7tGSAr1z6+iSgLvZ/TNMDpea323OpeKIft7ZbDag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iil+1+0AoVoV5X52L+9pRHUdXu2u9epmQHEjOz8abqVjJWmw6hIcsBUDlJVo9GziF gUibC8DzGhEs2KhnlxXfJklr0sPCuTvNfvBmI42MLf6Ys8cj4GzFex7WGxHMlOVPOp 7OgbsujGsaRRRel3AWIFkigx4bbgS93OufQNK/ig= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sibi Sankar , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.12 278/677] soc: qcom: mdt_loader: Detect truncated read of segments Date: Wed, 12 May 2021 16:45:24 +0200 Message-Id: <20210512144846.458200047@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 0648c55e3a21ccd816e99b6600d6199fbf39d23a ] Given that no validation of how much data the firmware loader read in for a given segment truncated segment files would best case result in a hash verification failure, without any indication of what went wrong. Improve this by validating that the firmware loader did return the amount of data requested. Fixes: 445c2410a449 ("soc: qcom: mdt_loader: Use request_firmware_into_buf()") Reviewed-by: Sibi Sankar Link: https://lore.kernel.org/r/20210107232526.716989-1-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/mdt_loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.30.2 diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 2ddaee5ef9cc..eba7f76f9d61 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -261,6 +261,15 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, break; } + if (seg_fw->size != phdr->p_filesz) { + dev_err(dev, + "failed to load segment %d from truncated file %s\n", + i, fw_name); + release_firmware(seg_fw); + ret = -EINVAL; + break; + } + release_firmware(seg_fw); }