* [PATCH] pci: pcie-rcar: fix a potential NULL pointer dereference
@ 2019-03-14 5:56 Kangjie Lu
2019-03-14 7:30 ` Geert Uytterhoeven
0 siblings, 1 reply; 8+ messages in thread
From: Kangjie Lu @ 2019-03-14 5:56 UTC (permalink / raw)
To: kjlu
Cc: pakki001, Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas,
linux-pci, linux-renesas-soc, linux-kernel
In case __get_free_pages fails and returns NULL, the fix returns
-ENOMEM and releases resources to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/pci/controller/pcie-rcar.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index c8febb009454..0ba26c31d928 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -929,6 +929,12 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
/* setup MSI data target */
msi->pages = __get_free_pages(GFP_KERNEL, 0);
+ if (!msi->pages) {
+ dev_err(dev, "failed to get free pages\n");
+ err = -ENOMEM;
+ goto err;
+ }
+
base = virt_to_phys((void *)msi->pages);
rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-14 5:56 [PATCH] pci: pcie-rcar: fix a potential NULL pointer dereference Kangjie Lu
@ 2019-03-14 7:30 ` Geert Uytterhoeven
2019-03-14 8:07 ` [PATCH v2] " Kangjie Lu
0 siblings, 1 reply; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-03-14 7:30 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas,
linux-pci, Linux-Renesas, Linux Kernel Mailing List
Hi Kangjie,
On Thu, Mar 14, 2019 at 6:56 AM Kangjie Lu <kjlu@umn.edu> wrote:
> In case __get_free_pages fails and returns NULL, the fix returns
> -ENOMEM and releases resources to avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Thanks for your patch!
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -929,6 +929,12 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
>
> /* setup MSI data target */
> msi->pages = __get_free_pages(GFP_KERNEL, 0);
> + if (!msi->pages) {
> + dev_err(dev, "failed to get free pages\n");
Please drop the dev_err().
The memory allocation core will already have printed a warning, cfr.
warn_alloc() in mm/page_alloc.c.
With that fixed:
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> + err = -ENOMEM;
> + goto err;
> + }
> +
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-14 7:30 ` Geert Uytterhoeven
@ 2019-03-14 8:07 ` Kangjie Lu
2019-03-14 8:10 ` Geert Uytterhoeven
0 siblings, 1 reply; 8+ messages in thread
From: Kangjie Lu @ 2019-03-14 8:07 UTC (permalink / raw)
To: kjlu
Cc: pakki001, Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas,
linux-pci, linux-renesas-soc, linux-kernel
In case __get_free_pages fails and returns NULL, the fix returns
-ENOMEM and releases resources to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
V2 removes the error message.
---
drivers/pci/controller/pcie-rcar.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index c8febb009454..71e55995c058 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -929,6 +929,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
/* setup MSI data target */
msi->pages = __get_free_pages(GFP_KERNEL, 0);
+ if (!msi->pages) {
+ err = -ENOMEM;
+ goto err;
+ }
base = virt_to_phys((void *)msi->pages);
rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-14 8:07 ` [PATCH v2] " Kangjie Lu
@ 2019-03-14 8:10 ` Geert Uytterhoeven
2019-03-15 7:29 ` Kangjie Lu
0 siblings, 1 reply; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-03-14 8:10 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas,
linux-pci, Linux-Renesas, Linux Kernel Mailing List
On Thu, Mar 14, 2019 at 9:08 AM Kangjie Lu <kjlu@umn.edu> wrote:
> In case __get_free_pages fails and returns NULL, the fix returns
> -ENOMEM and releases resources to avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Please keep my
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-14 8:10 ` Geert Uytterhoeven
@ 2019-03-15 7:29 ` Kangjie Lu
2019-03-15 10:07 ` Ulrich Hecht
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Kangjie Lu @ 2019-03-15 7:29 UTC (permalink / raw)
To: kjlu
Cc: Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas, linux-pci,
linux-renesas-soc, linux-kernel
In case __get_free_pages fails and returns NULL, the fix returns
-ENOMEM and releases resources to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
V2 removes the error message.
---
drivers/pci/controller/pcie-rcar.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index c8febb009454..71e55995c058 100644
--- a/drivers/pci/controller/pcie-rcar.c
+++ b/drivers/pci/controller/pcie-rcar.c
@@ -929,6 +929,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
/* setup MSI data target */
msi->pages = __get_free_pages(GFP_KERNEL, 0);
+ if (!msi->pages) {
+ err = -ENOMEM;
+ goto err;
+ }
base = virt_to_phys((void *)msi->pages);
rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-15 7:29 ` Kangjie Lu
@ 2019-03-15 10:07 ` Ulrich Hecht
2019-03-15 11:54 ` Simon Horman
2019-03-29 16:22 ` Lorenzo Pieralisi
2 siblings, 0 replies; 8+ messages in thread
From: Ulrich Hecht @ 2019-03-15 10:07 UTC (permalink / raw)
To: Kangjie Lu
Cc: Simon Horman, Lorenzo Pieralisi, Bjorn Helgaas, linux-pci,
linux-renesas-soc, linux-kernel
> On March 15, 2019 at 8:29 AM Kangjie Lu <kjlu@umn.edu> wrote:
>
>
> In case __get_free_pages fails and returns NULL, the fix returns
> -ENOMEM and releases resources to avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
CU
Uli
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-15 7:29 ` Kangjie Lu
2019-03-15 10:07 ` Ulrich Hecht
@ 2019-03-15 11:54 ` Simon Horman
2019-03-29 16:22 ` Lorenzo Pieralisi
2 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2019-03-15 11:54 UTC (permalink / raw)
To: Kangjie Lu
Cc: Lorenzo Pieralisi, Bjorn Helgaas, linux-pci, linux-renesas-soc,
linux-kernel
On Fri, Mar 15, 2019 at 02:29:43AM -0500, Kangjie Lu wrote:
> In case __get_free_pages fails and returns NULL, the fix returns
> -ENOMEM and releases resources to avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference
2019-03-15 7:29 ` Kangjie Lu
2019-03-15 10:07 ` Ulrich Hecht
2019-03-15 11:54 ` Simon Horman
@ 2019-03-29 16:22 ` Lorenzo Pieralisi
2 siblings, 0 replies; 8+ messages in thread
From: Lorenzo Pieralisi @ 2019-03-29 16:22 UTC (permalink / raw)
To: Kangjie Lu
Cc: Simon Horman, Bjorn Helgaas, linux-pci, linux-renesas-soc, linux-kernel
On Fri, Mar 15, 2019 at 02:29:43AM -0500, Kangjie Lu wrote:
> In case __get_free_pages fails and returns NULL, the fix returns
> -ENOMEM and releases resources to avoid NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> ---
> V2 removes the error message.
> ---
> drivers/pci/controller/pcie-rcar.c | 4 ++++
> 1 file changed, 4 insertions(+)
Applied to pci/rcar for v5.2, thanks.
Lorenzo
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index c8febb009454..71e55995c058 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -929,6 +929,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie)
>
> /* setup MSI data target */
> msi->pages = __get_free_pages(GFP_KERNEL, 0);
> + if (!msi->pages) {
> + err = -ENOMEM;
> + goto err;
> + }
> base = virt_to_phys((void *)msi->pages);
>
> rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR);
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-03-29 16:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-14 5:56 [PATCH] pci: pcie-rcar: fix a potential NULL pointer dereference Kangjie Lu
2019-03-14 7:30 ` Geert Uytterhoeven
2019-03-14 8:07 ` [PATCH v2] " Kangjie Lu
2019-03-14 8:10 ` Geert Uytterhoeven
2019-03-15 7:29 ` Kangjie Lu
2019-03-15 10:07 ` Ulrich Hecht
2019-03-15 11:54 ` Simon Horman
2019-03-29 16:22 ` Lorenzo Pieralisi
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).