From patchwork Wed May 12 14:45:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 435651 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5117326jao; Wed, 12 May 2021 12:24:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJya3s23DvmPnjdfeCnBzJhhaZ5d0F5obiePJYzUfWv1Yw2+I/A3HbUrBbJFKHTcMa0lpd2y X-Received: by 2002:a5d:9804:: with SMTP id a4mr27893167iol.164.1620847454867; Wed, 12 May 2021 12:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620847454; cv=none; d=google.com; s=arc-20160816; b=oevdOMOppTcxSpkZvvRAjfhpxUY/djG4LsSquF1x+IUgQzPTXondoNFFQOhhSWWtqy qk0iykAtnX/jekEI6tlS26WZxPYQ6MIqNWzRY4sw7AKvEvUcb8wzpjiBUefQwaIH1OW9 wZptgY7sQGiNdgGTNR4A2TmRttpYYeB28j2mHOHAQVvuyDxMjGnGJQfmi34969LSd9Np Q24HF9DaFYJ7+uMr3bu13xGGNv0lj9byVZlxtRDq4OTu7HQYwqNJDAzWYsDNL8Boviy2 vnpzFRerN7BASX7JntxdpkNMdpOtfxqWeJFCzZnckgjhG6SjwPBDT9KKW8RpTBJAYwJ6 WRrw== 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=S3qC9AE/jEWxmNtp7tMEbrOGEDhTodu8xTm2csM4ldY=; b=CqzZKsQTRq3WpHN1sUhI5/3TWc1ansVOedlwFp7kOa6nA3ABlPLvYQUgBZTVGW6Mu3 5KkPs3R9z0j8cV9g8wYKrl/7uBUObkG8bjrfAXYX7B3PNl4GUruzVdPrmAemYPbhYytm ZVSIRiDgAtimQMKYdTRgDA9oGgIehk/16Pp0L7biNb3V4dZ9LqyWQ2RMzAQOiEugjt8T DepUf7KETIB5UoPJJAhTqe+HNQcfAMbwBr2zERY/DJAR29olaw921K+oUrKGglZZgz2M 8fXMDwzUzh8DCZS6nS39lpwEKTshe/DHNfbkH+DG1acBoC8f5Bbx4G/OvBE3upOsmk6K YyRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eOPXHksn; 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.14; Wed, 12 May 2021 12:24:14 -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=eOPXHksn; 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 S237972AbhELQn5 (ORCPT + 12 others); Wed, 12 May 2021 12:43:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:57122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243152AbhELQgy (ORCPT ); Wed, 12 May 2021 12:36:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B780661CCF; Wed, 12 May 2021 16:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835270; bh=xfco83/Vv5h5DsQ/gshP76G6OEa8DgT+NMphR6cfa9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOPXHksnK7p4mCpxV5oDY3qy1zCMjGgoygkhgQZq6Aw/Kjwe2QjlyJUjz00ZoEQ53 z30D0YdGPax8eajjennMcqGvyQWxyWKKXgANWlIAQqRHSO85ZAjlNov58cEc2yUbic APfAop6CMzwokyiEh0WHWuXpd7tQ/qCFdU0cB+FI= 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 277/677] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz Date: Wed, 12 May 2021 16:45:23 +0200 Message-Id: <20210512144846.425707775@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 84168d1b54e76a1bcb5192991adde5176abe02e3 ] The code validates that segments of p_memsz bytes of a segment will fit in the provided memory region, but does not validate that p_filesz bytes will, which means that an incorrectly crafted ELF header might write beyond the provided memory region. Fixes: 051fb70fd4ea ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Reviewed-by: Sibi Sankar Link: https://lore.kernel.org/r/20210107233119.717173-1-bjorn.andersson@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/mdt_loader.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.30.2 diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 24cd193dec55..2ddaee5ef9cc 100644 --- a/drivers/soc/qcom/mdt_loader.c +++ b/drivers/soc/qcom/mdt_loader.c @@ -230,6 +230,14 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, break; } + if (phdr->p_filesz > phdr->p_memsz) { + dev_err(dev, + "refusing to load segment %d with p_filesz > p_memsz\n", + i); + ret = -EINVAL; + break; + } + ptr = mem_region + offset; if (phdr->p_filesz && phdr->p_offset < fw->size) {