From patchwork Wed May 12 14:48:02 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: 435544 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4907882jao; Wed, 12 May 2021 08:01:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUeMUa8kVoOvL8hsjvGlWItx638BvJE4ybaTM8k0Kjd8weybU9LhM/cAF1FDFpEZhhRU5H X-Received: by 2002:a6b:f10a:: with SMTP id e10mr27015474iog.188.1620831697299; Wed, 12 May 2021 08:01:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620831697; cv=none; d=google.com; s=arc-20160816; b=u2PVXamarmx6q1VIh1AUgCytFNhCMkecFNfD0dlkjl6Z8TDtF9RqlfEIXKfH6wrqzL aCdaFP8zqNqYqyJZ0AGUJfa1MfUBZZD6bGYkSuoU5jicoI3PqAmcykskRy/OXOAt2uj4 TLcOPxCMs1b6S2XSf+1ph/KKDC8TPQcGmFU8iy7WfRK3N1D20v3FTIIBrk/X0eqfkFUF xnxiVEvAZIV/18j1yw2FclEIr9xAu4hZn4LFmWIcRuQBsu5WoPTW3Iq3LhOoZJpigauw Xb5ptffS5Jl2yooSc4touDKcCBe7u1ClerKpffmfvIdfVLsofMztw/rxMGif3Rzwkf64 1zSw== 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=ys6nPZUQZqxkp1u2s++szTXzoy0malc7Kgk2qFXMqv38oDB1AuBcGCiyKD4Yj941rB qidJfF2aote7KVPmnN7FsYR8l0H3aDqqudaBBPma0kJcnRcgmubDUotT2FwrPkpkdViZ 9DpjE/ca8gBEER3eZyRoPT69FcWa2XfY7ff3LL7fVSBDh3NS4tIt/OqAQ01xLiyJHiiz TKG1PobEUh2NA+Z5WbEcNe+4zb3qFVoKO/s6AZVirpI2WzQ3YuAPWz7GalgoKGZSPSCS WJjRccziInhaipTrCcvi8VyS+ANopd7HSPp8xQ5r+awrdm6HsSnhS00JDVw3kuSa0/tz 1W5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QP709hF+; 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 r139si177320jac.21.2021.05.12.08.01.37; Wed, 12 May 2021 08:01:37 -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=QP709hF+; 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 S232967AbhELPC2 (ORCPT + 12 others); Wed, 12 May 2021 11:02:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:56088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232469AbhELPAV (ORCPT ); Wed, 12 May 2021 11:00:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1EDC361492; Wed, 12 May 2021 14:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620831419; bh=xfco83/Vv5h5DsQ/gshP76G6OEa8DgT+NMphR6cfa9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QP709hF+Cm8pmuTmnju80cLsRKzm+FbHhkWcaiVRRRaQFLogxVmbJ/4B3H4ywVwvr bCXtHOI25nHqn/mMJ8lCtbhHNsM7Vk1+IgG84f6OSFEzXEXmYEBxmegaIPcuXD77GH qT8zL+jegSYZVebh1EwJmQ8YfMuUiZqfAPQXUZGU= 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.4 111/244] soc: qcom: mdt_loader: Validate that p_filesz < p_memsz Date: Wed, 12 May 2021 16:48:02 +0200 Message-Id: <20210512144746.577041752@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144743.039977287@linuxfoundation.org> References: <20210512144743.039977287@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) {