From patchwork Thu Jun 10 19:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 457861 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp751736jae; Thu, 10 Jun 2021 12:23:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0pvTiaVb0RmtgSJHoiMhFIGjEKn/P1HcJ3bI2L3AO4e7gJJhhkfizyKd++2yraBFGeFLo X-Received: by 2002:a05:6402:10d7:: with SMTP id p23mr73294edu.74.1623353028593; Thu, 10 Jun 2021 12:23:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623353028; cv=none; d=google.com; s=arc-20160816; b=t29C/i+WkKtLBNpsru0y/RsmisYm7pUhI3sM5aLQykqxQ5K5OSQOBepgK6KhAByJaU 7LDejWrC/9oQdURjjSb83zYJrEXmxTAOExMIP7/LvNRzcQX3uKKL94XeL29ngJVEDgZO x4PnLM4T7Q+iWx4nhyc56VXz1rp4+c2EpY8reulwRujhdISTZ6RBmR3niVGC7llewa8m POETU/KK6YLhTHgpUslFJBmn6/qDIGYuIkVpQgRKsqNW4oiZqseYweQnjz5l6i/gM327 l+fMqs8V+1DpTFDFB+Gr1RyqppIO40Cc5gggTedOGziOcb9MhHi0NAwpQVWgRmIbpO48 VWzg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6lzDnIEiuHeqKMSHR2kedCosArXsL218NPTCRDYpYD8=; b=BkjbcKH/ZvMXGjGKtD6dq5YyF9xvzfGBO1U+8kz6Zy7gHkojq4YW49QKagUbOBcODr H7gOfaK3hQgsgivLM2rYoQFscWI3wYedM2i5+mGUXEUqGCw19lji6vm5deKDIqXm8oXp PjjziK+CiXgR7hLqzV8w3kLXVkd/mT02fmG0YhwSkEOgWfRAx9hyhwg8tQcHgfNhqYem zwLfLKf2udZKd6wTfSB/ReW2PxG+bgR8uMcAIrYx7tV9MDZaybBHWR0wAlvpg3NNqdpK poYer+dmCsvbxk2Pqxz3fM9eC0e+2JSxaYqoBCaPUYpXhbka/XDV8zJfzUCimd5Qe3/B 1T2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kDAqS9nl; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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 bz20si3523532ejc.486.2021.06.10.12.23.48; Thu, 10 Jun 2021 12:23:48 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-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=kDAqS9nl; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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 S230265AbhFJTZM (ORCPT + 8 others); Thu, 10 Jun 2021 15:25:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230059AbhFJTZL (ORCPT ); Thu, 10 Jun 2021 15:25:11 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D30DC061760 for ; Thu, 10 Jun 2021 12:23:15 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id b25so28242820iot.5 for ; Thu, 10 Jun 2021 12:23:15 -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 :mime-version:content-transfer-encoding; bh=6lzDnIEiuHeqKMSHR2kedCosArXsL218NPTCRDYpYD8=; b=kDAqS9nlvRXkAdNWf2DNRxD/rQ5ly86VqTrzfW6Mhwtt/5N2v7XQz2UGGT/KrxUbWs 6RVFcH4c33YI9ze+uik0zrtKh/7Ry1b8mM5qTj/uHzeQZkQE8iX4qlVIYQ/GmU7alHKj 37lleMphxA+w4GVDIX2Yp25onaTEB0oNinRGjMhu7EldtoVjjqNNVhTFqGGFpIc+85xb Jo/xstiUaTW1eTPhqJROWdr6GLkRZWknQrQleUVARNtsmsVv5G4zf0N+WrmBInqXLG/S UnVqJZrFHtVPeAV+rJCN2FsKo7NM7ES81cqRLnrN0FU9nbafIyMr8GTQ1REAbcRL5iDQ dYbQ== 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:mime-version:content-transfer-encoding; bh=6lzDnIEiuHeqKMSHR2kedCosArXsL218NPTCRDYpYD8=; b=Nz5UoJuBu+4ocF88Oq/BD6uamn0TPWP6z2L7kk59X7YvT2kD58gBIdfPnkBTTNjahM DwSQPvlMXQVjcwyGT8crfEsYdT6nI5C4mSBl2wdwwBZWpYSY/5zQMKn3W6ZKBFQkAvMD Ds6u6ZehA35b2zqixt+RRKAXZIAoef8DL1LqkoQB+kn6omQebNmIWoRnC7r9KS+xJCA+ 6tG94p+MdzWWaFayX4b7VLOwXc5bKCWs6wnIKqYqto+8dNHUP6WrxmhZoMA8JSZN8W81 +fJiJw9DbjrIAsVXC+lA8m3SMMvqT3OCrL9/mnC35+ZLHOyF+fij/98BWClXTNO0itcA s2iw== X-Gm-Message-State: AOAM533SmhealxV6khpazoenwRprb7etvqCBjT9mbMiLv+tAEhtlvewe t25wrklS5qkZpuTJjzwb4pFqyA== X-Received: by 2002:a05:6638:140c:: with SMTP id k12mr201699jad.126.1623352994670; Thu, 10 Jun 2021 12:23:14 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id w21sm2028684iol.52.2021.06.10.12.23.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 12:23:14 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/8] net: ipa: clean up header memory validation Date: Thu, 10 Jun 2021 14:23:02 -0500 Message-Id: <20210610192308.2739540-3-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210610192308.2739540-1-elder@linaro.org> References: <20210610192308.2739540-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do some general cleanup in ipa_cmd_header_valid(): - Delay assigning the mem variable until just before it's used. - Assign the maximum offset and size values together. - Improve comments explaining the single range of memory being made up of a modem portion and an AP portion. - Record the offset of the combined range in a local variable. - Do the initial size assignment right after assigning the offset. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_cmd.c | 46 ++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) -- 2.27.0 diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c index 525cdf28d9ea7..3e5f10d3c131d 100644 --- a/drivers/net/ipa/ipa_cmd.c +++ b/drivers/net/ipa/ipa_cmd.c @@ -200,41 +200,53 @@ bool ipa_cmd_table_valid(struct ipa *ipa, const struct ipa_mem *mem, /* Validate the memory region that holds headers */ static bool ipa_cmd_header_valid(struct ipa *ipa) { - const struct ipa_mem *mem = &ipa->mem[IPA_MEM_MODEM_HEADER]; struct device *dev = &ipa->pdev->dev; + const struct ipa_mem *mem; u32 offset_max; u32 size_max; + u32 offset; u32 size; - /* In ipa_cmd_hdr_init_local_add() we record the offset and size - * of the header table memory area. Make sure the offset and size - * fit in the fields that need to hold them, and that the entire - * range is within the overall IPA memory range. + /* In ipa_cmd_hdr_init_local_add() we record the offset and size of + * the header table memory area in an immediate command. Make sure + * the offset and size fit in the fields that need to hold them, and + * that the entire range is within the overall IPA memory range. */ offset_max = field_max(HDR_INIT_LOCAL_FLAGS_HDR_ADDR_FMASK); - if (mem->offset > offset_max || - ipa->mem_offset > offset_max - mem->offset) { - dev_err(dev, "header table region offset too large\n"); - dev_err(dev, " (0x%04x + 0x%04x > 0x%04x)\n", - ipa->mem_offset, mem->offset, offset_max); - - return false; - } - size_max = field_max(HDR_INIT_LOCAL_FLAGS_TABLE_SIZE_FMASK); - size = ipa->mem[IPA_MEM_MODEM_HEADER].size; + + /* The header memory area contains both the modem and AP header + * regions. The modem portion defines the address of the region. + */ + mem = &ipa->mem[IPA_MEM_MODEM_HEADER]; + offset = mem->offset; + size = mem->size; + + /* Make sure the offset fits in the IPA command */ + if (offset > offset_max || ipa->mem_offset > offset_max - offset) { + dev_err(dev, "header table region offset too large\n"); + dev_err(dev, " (0x%04x + 0x%04x > 0x%04x)\n", + ipa->mem_offset, offset, offset_max); + + return false; + } + + /* Add the size of the AP portion to the combined size */ size += ipa->mem[IPA_MEM_AP_HEADER].size; + /* Make sure the combined size fits in the IPA command */ if (size > size_max) { dev_err(dev, "header table region size too large\n"); dev_err(dev, " (0x%04x > 0x%08x)\n", size, size_max); return false; } - if (size > ipa->mem_size || mem->offset > ipa->mem_size - size) { + + /* Make sure the entire combined area fits in IPA memory */ + if (size > ipa->mem_size || offset > ipa->mem_size - size) { dev_err(dev, "header table region out of range\n"); dev_err(dev, " (0x%04x + 0x%04x > 0x%04x)\n", - mem->offset, size, ipa->mem_size); + offset, size, ipa->mem_size); return false; }