From patchwork Thu Jan 7 23:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 358310 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp65708jai; Thu, 7 Jan 2021 15:52:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxR281Y+Tpwxtu8zHB0HpWvrD+IwhuyV8VWF64hCokL9mxRqKk9ex6NQ2mXITHqb4l0zRvc X-Received: by 2002:a17:906:b082:: with SMTP id x2mr861877ejy.100.1610063546767; Thu, 07 Jan 2021 15:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610063546; cv=none; d=google.com; s=arc-20160816; b=JIjeRJdZt72Hli9KgCc5NidqawPrpJSXs2wwINvBf5jKHHEwkPSOttokxdKTyCQEOT C1Qr/US8jwaq/OAFsLfLfuAtMaq9VydBRtNYZiVPFYqorSh2bTn4naqh8K83x5zE3rNA GTGQe6vSkoUXcPD+HgMm02vdWCWmhMvPCHfVqucAvJ6BZ3dGdBSYNNmxEzVTy1F1gtmH hIQZRQQy5fh0B+bfRDcpxvdltyhrefRcEBx/AuTL1dDeHEx94GNplpWZsjxwuzYVovkR Bw4EqVZbw7kQZO7sjRXlXfBc8ikfQ/ksURcyrlVarrR2w/WfojlhmUZnSeQ2FuyxZM2W OdcQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=NqN+liZ8bQOGKYLOo+A64hpDDNU7IHxrgUmkHKS7+20=; b=EV8gmwsAjZXAj0DTXvRH/WgL0X0c+VdslQlzUlRU+DukGVZdQ6FLscIRvraxoFg3U/ V0CTyFcTCBenwrJWqY0I9lGE7PilB2luTvYYfmRZBl14caRvc7QlYMtMZJkn72bR+UCr ysFyqwmAQlguFxYd3PnUCll9OHyIZ1w9bJPPPfTCRXelhswVPht2fngwr8TYtfzlGME2 ps9JmwdHqLOhcg3qLgzMmW597RWSoOJtpldDWqQtzFEAChZPyLDkF1SQrosOI/iYohmq SXl6pNjRgjqjw9K/nPqpQYK7xOiR+DLh0t83LTK3jdoq7dpmA34ScWW9mdh4p6p3xkzy yIlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vnc0LMRT; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gq1si2753275ejb.675.2021.01.07.15.52.26; Thu, 07 Jan 2021 15:52:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-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=@linaro.org header.s=google header.b=vnc0LMRT; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729432AbhAGXvM (ORCPT + 15 others); Thu, 7 Jan 2021 18:51:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729005AbhAGXvM (ORCPT ); Thu, 7 Jan 2021 18:51:12 -0500 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0B96C0612F5 for ; Thu, 7 Jan 2021 15:50:31 -0800 (PST) Received: by mail-ot1-x32c.google.com with SMTP id q25so8045796otn.10 for ; Thu, 07 Jan 2021 15:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NqN+liZ8bQOGKYLOo+A64hpDDNU7IHxrgUmkHKS7+20=; b=vnc0LMRTF59D+KMFH856gCjA9A/mEA6GmOSoE3AUIRX+Uu0jbIGUfFKSwfGAjT6NWE wFR/lBAfTeQ4Ul+DC7gjtKNriSjPGwaDe8St6FKwMMtaREuIWOWTXNYlP2yNccu6yROP 6K73NL+U4CdmCrUKalYG9xHVfE9CY0ynRCaEtcAOYMdKG4X3iGvNqvL8Zby6fYaU/LTL mDlkcuhcj883kNn9NVyNJYk6s9oYQ/O8wLc0MKnMQ8IRUPpscSxcfYy2njpuJyJOdxun 4o5rL97dfUlyfrJl8UH+IMBDXpgz7l2kNdu3zfPrYsLQlVf1BGt0Nvb7dI9ngbqBF9JW 2+5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NqN+liZ8bQOGKYLOo+A64hpDDNU7IHxrgUmkHKS7+20=; b=ZMZzA19Nfj7M8B7VoNaaX24b4Mor+gRUewz4jDJWd5+6imjb0MqzA0ReI9Q5vdW3K0 6EG7SxF65IJZUMIISaes2dHbsEDpI7Iv9wcfwZ5fnS0DoOJdTUfhJzx08NaFWFSVejn9 hs1DWGWpQuvdKG8FfMDpMr0xCxRbYTOVXKYQzUgGuOApjAAVmB5tL+bSiQj/NdFNHsnL xVok336NOCtQMN7qZW1vKg98r6HzIU+nYw5xC34OcNrjvYO3EmCpt3V6E7k1wwwgPVg7 k3SrAXONq1q5GdcviXSuDeehQoRGAH/Tbi8wtaf6vIjDbGiT1Y3nwVZtVUZ1dwNyHQ8a Pm3A== X-Gm-Message-State: AOAM532BqqtmhJuFE5ze4oyngzFobwbkGoP+cCuyJ6ivWeZg/XEHq0jg EuzuTINAukDGkzwS1a0L1ZE42g== X-Received: by 2002:a9d:7e8c:: with SMTP id m12mr734389otp.38.1610063431220; Thu, 07 Jan 2021 15:50:31 -0800 (PST) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id v207sm1620439oif.58.2021.01.07.15.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 15:50:30 -0800 (PST) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Ohad Ben-Cohen , Mathieu Poirier , Sibi Sankar Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate p_filesz in ELF loader Date: Thu, 7 Jan 2021 15:50:53 -0800 Message-Id: <20210107235053.745888-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Analog to the issue in the common mdt_loader code the MSS ELF loader does not validate that p_filesz bytes will fit in the memory region and that the loaded segments are not truncated. Fix this in the same way as proposed for the mdt_loader. Fixes: 135b9e8d1cd8 ("remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load") Signed-off-by: Bjorn Andersson --- drivers/remoteproc/qcom_q6v5_mss.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.29.2 diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 66106ba25ba3..2b59e0cbdce1 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1210,6 +1210,14 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; } + if (phdr->p_filesz > phdr->p_memsz) { + dev_err(qproc->dev, + "refusing to load segment %d with p_filesz > p_memsz\n", + i); + ret = -EINVAL; + break; + } + ptr = memremap(qproc->mpss_phys + offset, phdr->p_memsz, MEMREMAP_WC); if (!ptr) { dev_err(qproc->dev, @@ -1241,6 +1249,15 @@ static int q6v5_mpss_load(struct q6v5 *qproc) goto release_firmware; } + if (seg_fw->size != phdr->p_filesz) { + dev_err(qproc->dev, + "failed to load segment %d from truncated file %s\n", + i, fw_name); + ret = -EINVAL; + memunmap(ptr); + break; + } + release_firmware(seg_fw); }