Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933085AbcJLRoU (ORCPT ); Wed, 12 Oct 2016 13:44:20 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:35712 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754879AbcJLRoK (ORCPT ); Wed, 12 Oct 2016 13:44:10 -0400 From: Loic Pallardy To: , , CC: , , , Subject: [PATCH v3 18/20] remoteproc: core: Clean-up resource table sanity checks Date: Wed, 12 Oct 2016 18:00:36 +0200 Message-ID: <1476288038-24909-19-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> References: <1476288038-24909-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.201.23.23] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-12_09:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6005 Lines: 173 As resource table has been verified after just loading, the different sanity checks done when accessing resources are no more needed. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 47 ++++++------------------------------ 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 849460e..ee2dc8d 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -50,7 +50,7 @@ static LIST_HEAD(rproc_list); typedef int (*rproc_handle_resources_t)(struct rproc *rproc, struct resource_table *table, int len); typedef int (*rproc_handle_resource_t)(struct rproc *rproc, - void *, int offset, int avail); + void *, int offset); /* Unique indices for remoteproc devices */ static DEFINE_IDA(rproc_dev_index); @@ -300,7 +300,6 @@ void rproc_free_vring(struct rproc_vring *rvring) * rproc_handle_vdev() - handle a vdev fw resource * @rproc: the remote processor * @rsc: the vring resource descriptor - * @avail: size of available data (for sanity checking the image) * * This resource entry requests the host to statically register a virtio * device (vdev), and setup everything needed to support it. It contains @@ -324,19 +323,12 @@ void rproc_free_vring(struct rproc_vring *rvring) * Returns 0 on success, or an appropriate error code otherwise */ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, - int offset, int avail) + int offset) { struct device *dev = &rproc->dev; struct rproc_vdev *rvdev; int i, ret; - /* make sure resource isn't truncated */ - if (sizeof(*rsc) + rsc->num_of_vrings * sizeof(struct fw_rsc_vdev_vring) - + rsc->config_len > avail) { - dev_err(dev, "vdev rsc is truncated\n"); - return -EINVAL; - } - /* make sure reserved bytes are zeroes */ if (rsc->reserved[0] || rsc->reserved[1]) { dev_err(dev, "vdev rsc has non zero reserved bytes\n"); @@ -388,7 +380,6 @@ free_rvdev: * rproc_handle_trace() - handle a shared trace buffer resource * @rproc: the remote processor * @rsc: the trace resource descriptor - * @avail: size of available data (for sanity checking the image) * * In case the remote processor dumps trace logs into memory, * export it via debugfs. @@ -401,18 +392,13 @@ free_rvdev: * Returns 0 on success, or an appropriate error code otherwise */ static int rproc_handle_trace(struct rproc *rproc, struct fw_rsc_trace *rsc, - int offset, int avail) + int offset) { struct rproc_mem_entry *trace; struct device *dev = &rproc->dev; void *ptr; char name[15]; - if (sizeof(*rsc) > avail) { - dev_err(dev, "trace rsc is truncated\n"); - return -EINVAL; - } - /* make sure reserved bytes are zeroes */ if (rsc->reserved) { dev_err(dev, "trace rsc has non zero reserved bytes\n"); @@ -459,7 +445,6 @@ static int rproc_handle_trace(struct rproc *rproc, struct fw_rsc_trace *rsc, * rproc_handle_devmem() - handle devmem resource entry * @rproc: remote processor handle * @rsc: the devmem resource entry - * @avail: size of available data (for sanity checking the image) * * Remote processors commonly need to access certain on-chip peripherals. * @@ -481,7 +466,7 @@ static int rproc_handle_trace(struct rproc *rproc, struct fw_rsc_trace *rsc, * are outside those ranges. */ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc, - int offset, int avail) + int offset) { struct rproc_mem_entry *mapping; struct device *dev = &rproc->dev; @@ -491,11 +476,6 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc, if (!rproc->domain) return -EINVAL; - if (sizeof(*rsc) > avail) { - dev_err(dev, "devmem rsc is truncated\n"); - return -EINVAL; - } - /* make sure reserved bytes are zeroes */ if (rsc->reserved) { dev_err(dev, "devmem rsc has non zero reserved bytes\n"); @@ -537,7 +517,6 @@ out: * rproc_handle_carveout() - handle phys contig memory allocation requests * @rproc: rproc handle * @rsc: the resource entry - * @avail: size of available data (for image validation) * * This function will handle firmware requests for allocation of physically * contiguous memory regions. @@ -553,7 +532,7 @@ out: */ static int rproc_handle_carveout(struct rproc *rproc, struct fw_rsc_carveout *rsc, - int offset, int avail) + int offset) { struct rproc_mem_entry *carveout, *mapping; struct device *dev = &rproc->dev; @@ -561,11 +540,6 @@ static int rproc_handle_carveout(struct rproc *rproc, void *va; int ret; - if (sizeof(*rsc) > avail) { - dev_err(dev, "carveout rsc is truncated\n"); - return -EINVAL; - } - /* make sure reserved bytes are zeroes */ if (rsc->reserved) { dev_err(dev, "carveout rsc has non zero reserved bytes\n"); @@ -674,7 +648,7 @@ free_carv: } static int rproc_count_vrings(struct rproc *rproc, struct fw_rsc_vdev *rsc, - int offset, int avail) + int offset) { /* Summarize the number of notification IDs */ rproc->max_notifyid += rsc->num_of_vrings; @@ -708,15 +682,8 @@ static int rproc_handle_resources(struct rproc *rproc, int len, for (i = 0; i < rproc->table_ptr->num; i++) { int offset = rproc->table_ptr->offset[i]; struct fw_rsc_hdr *hdr = (void *)rproc->table_ptr + offset; - int avail = len - offset - sizeof(*hdr); void *rsc = (void *)hdr + sizeof(*hdr); - /* make sure table isn't truncated */ - if (avail < 0) { - dev_err(dev, "rsc table is truncated\n"); - return -EINVAL; - } - dev_dbg(dev, "rsc: type %d\n", hdr->type); if (hdr->type >= RSC_LAST) { @@ -728,7 +695,7 @@ static int rproc_handle_resources(struct rproc *rproc, int len, if (!handler) continue; - ret = handler(rproc, rsc, offset + sizeof(*hdr), avail); + ret = handler(rproc, rsc, offset + sizeof(*hdr)); if (ret) break; } -- 1.9.1