* [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc
@ 2017-03-27 8:27 Alexey Kardashevskiy
2017-04-11 8:28 ` Alexey Kardashevskiy
2017-05-01 2:58 ` [kernel, " Michael Ellerman
0 siblings, 2 replies; 4+ messages in thread
From: Alexey Kardashevskiy @ 2017-03-27 8:27 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Alexey Kardashevskiy, David Gibson, Michael Ellerman
pnv_pci_table_alloc() ignores possible failure from kzalloc_node(),
this adds a check. There are 2 callers of pnv_pci_table_alloc(),
one already checks for tbl!=NULL, this adds WARN_ON() to the other path
which only happens during boot time in IODA1 and not expected to fail.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v2:
* s/BUG_ON/WARN_ON/
---
arch/powerpc/platforms/powernv/pci-ioda.c | 3 +++
arch/powerpc/platforms/powernv/pci.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index e36738291c32..04ef03a5201b 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2128,6 +2128,9 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
found:
tbl = pnv_pci_table_alloc(phb->hose->node);
+ if (WARN_ON(!tbl))
+ return;
+
iommu_register_group(&pe->table_group, phb->hose->global_number,
pe->pe_number);
pnv_pci_link_table_and_group(phb->hose->node, 0, tbl, &pe->table_group);
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index eb835e977e33..9acdf6889c0d 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -766,6 +766,9 @@ struct iommu_table *pnv_pci_table_alloc(int nid)
struct iommu_table *tbl;
tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, nid);
+ if (!tbl)
+ return NULL;
+
INIT_LIST_HEAD_RCU(&tbl->it_group_list);
return tbl;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc
2017-03-27 8:27 [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc Alexey Kardashevskiy
@ 2017-04-11 8:28 ` Alexey Kardashevskiy
2017-04-28 6:21 ` Alexey Kardashevskiy
2017-05-01 2:58 ` [kernel, " Michael Ellerman
1 sibling, 1 reply; 4+ messages in thread
From: Alexey Kardashevskiy @ 2017-04-11 8:28 UTC (permalink / raw)
To: linuxppc-dev; +Cc: David Gibson, Michael Ellerman
On 27/03/17 19:27, Alexey Kardashevskiy wrote:
> pnv_pci_table_alloc() ignores possible failure from kzalloc_node(),
> this adds a check. There are 2 callers of pnv_pci_table_alloc(),
> one already checks for tbl!=NULL, this adds WARN_ON() to the other path
> which only happens during boot time in IODA1 and not expected to fail.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> Changes:
> v2:
> * s/BUG_ON/WARN_ON/
Bad/good?
> ---
> arch/powerpc/platforms/powernv/pci-ioda.c | 3 +++
> arch/powerpc/platforms/powernv/pci.c | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> index e36738291c32..04ef03a5201b 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -2128,6 +2128,9 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
>
> found:
> tbl = pnv_pci_table_alloc(phb->hose->node);
> + if (WARN_ON(!tbl))
> + return;
> +
> iommu_register_group(&pe->table_group, phb->hose->global_number,
> pe->pe_number);
> pnv_pci_link_table_and_group(phb->hose->node, 0, tbl, &pe->table_group);
> diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
> index eb835e977e33..9acdf6889c0d 100644
> --- a/arch/powerpc/platforms/powernv/pci.c
> +++ b/arch/powerpc/platforms/powernv/pci.c
> @@ -766,6 +766,9 @@ struct iommu_table *pnv_pci_table_alloc(int nid)
> struct iommu_table *tbl;
>
> tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, nid);
> + if (!tbl)
> + return NULL;
> +
> INIT_LIST_HEAD_RCU(&tbl->it_group_list);
>
> return tbl;
>
--
Alexey
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc
2017-04-11 8:28 ` Alexey Kardashevskiy
@ 2017-04-28 6:21 ` Alexey Kardashevskiy
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Kardashevskiy @ 2017-04-28 6:21 UTC (permalink / raw)
To: linuxppc-dev; +Cc: David Gibson, Michael Ellerman
On Tue, 11 Apr 2017 18:28:42 +1000
Alexey Kardashevskiy <aik@ozlabs.ru> wrote:
> On 27/03/17 19:27, Alexey Kardashevskiy wrote:
> > pnv_pci_table_alloc() ignores possible failure from kzalloc_node(),
> > this adds a check. There are 2 callers of pnv_pci_table_alloc(),
> > one already checks for tbl!=NULL, this adds WARN_ON() to the other path
> > which only happens during boot time in IODA1 and not expected to fail.
> >
> > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> > ---
> > Changes:
> > v2:
> > * s/BUG_ON/WARN_ON/
>
> Bad/good?
Ping?
>
>
> > ---
> > arch/powerpc/platforms/powernv/pci-ioda.c | 3 +++
> > arch/powerpc/platforms/powernv/pci.c | 3 +++
> > 2 files changed, 6 insertions(+)
> >
> > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> > index e36738291c32..04ef03a5201b 100644
> > --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> > @@ -2128,6 +2128,9 @@ static void pnv_pci_ioda1_setup_dma_pe(struct pnv_phb *phb,
> >
> > found:
> > tbl = pnv_pci_table_alloc(phb->hose->node);
> > + if (WARN_ON(!tbl))
> > + return;
> > +
> > iommu_register_group(&pe->table_group, phb->hose->global_number,
> > pe->pe_number);
> > pnv_pci_link_table_and_group(phb->hose->node, 0, tbl, &pe->table_group);
> > diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
> > index eb835e977e33..9acdf6889c0d 100644
> > --- a/arch/powerpc/platforms/powernv/pci.c
> > +++ b/arch/powerpc/platforms/powernv/pci.c
> > @@ -766,6 +766,9 @@ struct iommu_table *pnv_pci_table_alloc(int nid)
> > struct iommu_table *tbl;
> >
> > tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, nid);
> > + if (!tbl)
> > + return NULL;
> > +
> > INIT_LIST_HEAD_RCU(&tbl->it_group_list);
> >
> > return tbl;
> >
>
>
--
Alexey
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [kernel, v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc
2017-03-27 8:27 [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc Alexey Kardashevskiy
2017-04-11 8:28 ` Alexey Kardashevskiy
@ 2017-05-01 2:58 ` Michael Ellerman
1 sibling, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2017-05-01 2:58 UTC (permalink / raw)
To: Alexey Kardashevskiy, linuxppc-dev; +Cc: Alexey Kardashevskiy, David Gibson
On Mon, 2017-03-27 at 08:27:37 UTC, Alexey Kardashevskiy wrote:
> pnv_pci_table_alloc() ignores possible failure from kzalloc_node(),
> this adds a check. There are 2 callers of pnv_pci_table_alloc(),
> one already checks for tbl!=NULL, this adds WARN_ON() to the other path
> which only happens during boot time in IODA1 and not expected to fail.
>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/82eae1afbbdcaf2d716f88025736dc
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-01 2:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-27 8:27 [PATCH kernel v2] powerpc/powernv: Check kzalloc() return value in pnv_pci_table_alloc Alexey Kardashevskiy
2017-04-11 8:28 ` Alexey Kardashevskiy
2017-04-28 6:21 ` Alexey Kardashevskiy
2017-05-01 2:58 ` [kernel, " Michael Ellerman
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).