From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Marek Vasut <marek.vasut@gmail.com>
Cc: linux-pci <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 <linux-renesas-soc@vger.kernel.org>
Subject: Re: [PATCH V2 1/3] PCI: rcar: Move the inbound index check
Date: Fri, 9 Aug 2019 19:52:07 +0200 [thread overview]
Message-ID: <CAMuHMdV9baf=p5RkbcPikXfPV2Uo-qhm80-kcJyHh4Wm1wALcA@mail.gmail.com> (raw)
In-Reply-To: <20190809174825.2572-1-marek.vasut@gmail.com>
Hi Marek,
On Fri, Aug 9, 2019 at 7:48 PM <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>
Thanks for your patch!
> --- 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) {
Shouldn't that check be "idx >= MAX_NR_INBOUND_MAPS - 1" now?
> + 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;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
prev parent reply other threads:[~2019-08-09 17:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 17:48 [PATCH V2 1/3] PCI: rcar: Move the inbound index check marek.vasut
2019-08-09 17:48 ` [PATCH V2 2/3] PCI: rcar: Do not abort on too many inbound dma-ranges marek.vasut
2019-08-09 17:48 ` [PATCH V2 3/3] PCI: rcar: Recalculate inbound range alignment for each controller entry marek.vasut
2019-08-09 17:52 ` Geert Uytterhoeven [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='CAMuHMdV9baf=p5RkbcPikXfPV2Uo-qhm80-kcJyHh4Wm1wALcA@mail.gmail.com' \
--to=geert@linux-m68k.org \
--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).