From: Andrew Murray <andrew.murray@arm.com>
To: marek.vasut@gmail.com
Cc: linux-pci@vger.kernel.org,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Wolfram Sang <wsa@the-dreams.de>,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH V3 1/3] PCI: rcar: Move the inbound index check
Date: Mon, 21 Oct 2019 11:11:15 +0100 [thread overview]
Message-ID: <20191021101114.GL47056@e119886-lin.cambridge.arm.com> (raw)
In-Reply-To: <20190809175741.7066-1-marek.vasut@gmail.com>
On Fri, Aug 09, 2019 at 07:57:39PM +0200, marek.vasut@gmail.com wrote:
> From: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> Since the $idx variable value is stored across multiple calls to
> rcar_pcie_inbound_ranges() function, and the $idx value is used to
> index registers which are written, subsequent calls might cause
> the $idx value to be high enough to trigger writes into nonexistent
> registers.
>
> Fix this by moving the $idx value check to the beginning of the loop.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> To: linux-pci@vger.kernel.org
> ---
> V2: New patch
> V3: Adjust the check to idx >= MAX_NR_INBOUND_MAPS - 1
> ---
> drivers/pci/controller/pcie-rcar.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index f6a669a9af41..56a6433eb70b 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -1048,6 +1048,10 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
> mask &= ~0xf;
>
> while (cpu_addr < cpu_end) {
> + if (idx >= MAX_NR_INBOUND_MAPS - 1) {
> + dev_err(pcie->dev, "Failed to map inbound regions!\n");
> + return -EINVAL;
> + }
> /*
> * Set up 64-bit inbound regions as the range parser doesn't
> * distinguish between 32 and 64-bit types.
> @@ -1067,11 +1071,6 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
> pci_addr += size;
> cpu_addr += size;
> idx += 2;
> -
> - if (idx > MAX_NR_INBOUND_MAPS) {
> - dev_err(pcie->dev, "Failed to map inbound regions!\n");
> - return -EINVAL;
> - }
> }
> *index = idx;
>
> --
> 2.20.1
>
prev parent reply other threads:[~2019-10-21 10:11 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 17:57 [PATCH V3 1/3] PCI: rcar: Move the inbound index check marek.vasut
2019-08-09 17:57 ` [PATCH V3 2/3] PCI: rcar: Do not abort on too many inbound dma-ranges marek.vasut
2019-08-16 13:23 ` Simon Horman
2019-08-16 13:28 ` Marek Vasut
2019-08-16 13:38 ` Simon Horman
2019-08-16 17:41 ` Marek Vasut
2019-10-21 10:18 ` Andrew Murray
2019-10-26 18:03 ` Marek Vasut
2019-10-26 20:36 ` Andrew Murray
2019-10-26 21:06 ` Andrew Murray
2019-11-06 23:37 ` Marek Vasut
2019-11-07 14:19 ` Andrew Murray
2019-11-16 15:48 ` Marek Vasut
2019-11-18 18:42 ` Robin Murphy
2019-12-22 7:46 ` Marek Vasut
2019-10-16 15:00 ` Lorenzo Pieralisi
2019-10-16 15:10 ` Marek Vasut
2019-10-16 15:26 ` Lorenzo Pieralisi
2019-10-16 15:29 ` Marek Vasut
2019-10-16 16:18 ` Lorenzo Pieralisi
2019-10-16 18:12 ` Rob Herring
2019-10-16 18:17 ` Marek Vasut
2019-10-16 20:25 ` Rob Herring
2019-10-16 21:15 ` Marek Vasut
2019-10-16 22:26 ` Rob Herring
2019-10-16 22:33 ` Marek Vasut
2019-10-17 7:06 ` Geert Uytterhoeven
2019-10-17 10:55 ` Marek Vasut
2019-10-17 13:06 ` Robin Murphy
2019-10-17 14:00 ` Marek Vasut
2019-10-17 14:36 ` Rob Herring
2019-10-17 15:01 ` Marek Vasut
2019-10-18 9:53 ` Lorenzo Pieralisi
2019-10-18 12:22 ` Marek Vasut
2019-10-18 12:53 ` Robin Murphy
2019-10-18 14:26 ` Marek Vasut
2019-10-18 15:44 ` Robin Murphy
2019-10-18 16:44 ` Marek Vasut
2019-10-18 17:35 ` Robin Murphy
2019-10-18 18:44 ` Marek Vasut
2019-10-21 8:32 ` Geert Uytterhoeven
2019-11-19 12:10 ` Robin Murphy
2019-10-18 10:06 ` Andrew Murray
2019-10-18 10:17 ` Geert Uytterhoeven
2019-10-18 11:40 ` Andrew Murray
2019-08-09 17:57 ` [PATCH V3 3/3] PCI: rcar: Recalculate inbound range alignment for each controller entry marek.vasut
2019-10-21 10:39 ` Andrew Murray
2019-08-16 10:52 ` [PATCH V3 1/3] PCI: rcar: Move the inbound index check Lorenzo Pieralisi
2019-08-16 10:59 ` Marek Vasut
2019-08-16 11:10 ` Lorenzo Pieralisi
2019-10-15 20:14 ` Marek Vasut
2019-10-21 10:11 ` Andrew Murray [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021101114.GL47056@e119886-lin.cambridge.arm.com \
--to=andrew.murray@arm.com \
--cc=geert+renesas@glider.be \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut+renesas@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).