From patchwork Wed May 2 01:10:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 134809 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp124802lji; Tue, 1 May 2018 18:12:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrclV+abdTwCrv2SPGXoMTw3fY+ux1++8KBY4Lhxuefxnsf5O6V4+kcYnn3Cf+OMenVjLZD X-Received: by 10.98.242.74 with SMTP id y10mr17582497pfl.75.1525223523784; Tue, 01 May 2018 18:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525223523; cv=none; d=google.com; s=arc-20160816; b=sReORx59fqFbxpWWTtPB8gCnppnRQh1GiMHC6WFqjMUf/A28QhwNbpQhXgU4a2DeEf zG7DD2vRLtaWMiRgtH3TMR6RnY7Q6zWvovAokjvDLLAfCxXF/hQDQcB2/OxSdNThAg0T 08kZX1BnHRZhOixf2ArafZtS64VsWeA5mljJbf0bG5H8uyHCfMUdTk2fC5YEZfIPDTwK mWhJKW/2IkK7EEI6yqE8nxYRbI11xJGEo4wGyd3QL1rHMtYqeDGJCnjnn6fuc5GOL4Ze IhXnHAM+mLoPYqe96rnTIqbrKfHC/3yo+QKOQ/P6L5+eEN1z2mUcqNAoQHjga2IFOgsJ YXHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=EkNWVE78UHIGfw333sUDiOmWxutpxKxppyp0BR+tlNA=; b=Kc6gNRPbhZUF6Cgfzc/umnvzhO6/u9Y46SCrCPdTT6HpX6UHeztf6Y5ksjMtcy4D5N JoekyClndjNKDUMtUdN+Oa+LN7k3QhiUSAD2d67b6BnKnZDPspQk210jGNgURwRdNW37 Jqk7MKjJt7qNrWnkZT3XhKSl95Y4fodTE382hj1B1/HQfxI8QiB9hF5SBdfhJTcwx8tb I6Q3bPF6SePt3Wlbs5e0psFWAX3bORDY2Kkn3EWdBRRTmMxCXTF5+yrG65ONg/bO03WY 4FZ2k2FG2SUzxf/jsfpxIhRA7NH4z6Fyq13qOApNjq+t1S8/FA3apTwkFm7TvYfS05N0 26ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jvKBWBhK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id a92-v6si10794792pla.291.2018.05.01.18.12.03; Tue, 01 May 2018 18:12:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jvKBWBhK; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1751521AbeEBBMA (ORCPT + 29 others); Tue, 1 May 2018 21:12:00 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:42386 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbeEBBKg (ORCPT ); Tue, 1 May 2018 21:10:36 -0400 Received: by mail-io0-f196.google.com with SMTP id a10-v6so15576755ioc.9 for ; Tue, 01 May 2018 18:10:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EkNWVE78UHIGfw333sUDiOmWxutpxKxppyp0BR+tlNA=; b=jvKBWBhKlN55UHYs8BMJXHfHTa9Dkdim4TD2IDwbD7hDCnkRlZzNBKYaluR2RrgEWo C0Xg8KZ2GkMLg2hNIBaLE4FA05tg0lDqaYBMS63T9tuRdDGLjWUoxsWx0+SZw7mi7LzT t3QL+upbPYci3JgIUX0KAVZccUELX9Ez3krAw= 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:in-reply-to :references; bh=EkNWVE78UHIGfw333sUDiOmWxutpxKxppyp0BR+tlNA=; b=EJz9FOpxsmSN5kGXiWwZ9/9E1cRhZ84fFPlESc1ppqVqPonFzDSBpIXVEqJc5OBSGX iCB4zf2TSC0MaEF6kO0QZoIpQC3/Yun177Jw0S0+9vZ4wIPc1MgfCp4f24r8lU2sq/xP Q/+7QNd5xVcKQPB9LMgoc8OVq0Rrfm1T6k7oknGbWfXXjyUM4KxgCeCm0KqsX5FxIjkY KtOIVhi0fQcuB5DpFpwrIclZRLOmTOr4cYdc8XwuRr9XTBvDRi19ZYF84aRkOLLCw5N3 L7VKVJG9aDkiyghOVULLtTUAcrgxme7KiZlOzai/p8V6UGOvSUkmqoD/KnSO1ycL8oc8 dNyw== X-Gm-Message-State: ALQs6tDDJHQIaB+NeGncZtrbl43jvq7uhqzADiHRBJcDFRhSh2XBfDlT e+hd1zJzQN+MJh6iQnep4f0Dig== X-Received: by 2002:a6b:a2d1:: with SMTP id l200-v6mr19371397ioe.166.1525223435581; Tue, 01 May 2018 18:10:35 -0700 (PDT) Received: from presto.localdomain (c-71-195-29-92.hsd1.mn.comcast.net. [71.195.29.92]) by smtp.gmail.com with ESMTPSA id g200-v6sm2082479itb.26.2018.05.01.18.10.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 18:10:35 -0700 (PDT) From: Alex Elder To: andy.gross@linaro.org Cc: clew@codeaurora.org, aneela@codeaurora.org, david.brown@linaro.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] soc: qcom: smem: verify partition header size Date: Tue, 1 May 2018 20:10:15 -0500 Message-Id: <20180502011019.22812-9-elder@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180502011019.22812-1-elder@linaro.org> References: <20180502011019.22812-1-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add verification in qcom_smem_partition_header() that the size in a partition's header structure matches the size in its partition table entry. Signed-off-by: Alex Elder --- drivers/soc/qcom/smem.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) -- 2.14.1 diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index d52a282f7338..f1e6e4609ccb 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -737,6 +737,7 @@ qcom_smem_partition_header(struct qcom_smem *smem, struct smem_ptable_entry *entry) { struct smem_partition_header *header; + u32 size; header = smem->regions[0].virt_base + le32_to_cpu(entry->offset); @@ -747,6 +748,13 @@ qcom_smem_partition_header(struct qcom_smem *smem, return NULL; } + size = le32_to_cpu(header->size); + if (size != le32_to_cpu(entry->size)) { + dev_err(smem->dev, "bad partition size (%u != %u)\n", + size, le32_to_cpu(entry->size)); + return NULL; + } + return header; } @@ -795,11 +803,6 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem) return -EINVAL; } - if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) { - dev_err(smem->dev, "Global partition has invalid size\n"); - return -EINVAL; - } - size = le32_to_cpu(header->offset_free_uncached); if (size > le32_to_cpu(header->size)) { dev_err(smem->dev, @@ -868,12 +871,6 @@ static int qcom_smem_enumerate_partitions(struct qcom_smem *smem, return -EINVAL; } - if (le32_to_cpu(header->size) != le32_to_cpu(entry->size)) { - dev_err(smem->dev, - "Partition %d has invalid size\n", i); - return -EINVAL; - } - if (le32_to_cpu(header->offset_free_uncached) > le32_to_cpu(header->size)) { dev_err(smem->dev, "Partition %d has invalid free pointer\n", i);