On Wed, 2 Dec 2020, Bertrand Marquis wrote: > > On 28 Nov 2020, at 11:36, Julien Grall wrote: > > > > From: Julien Grall > > > > init_one_desc_irq() can return an error if it is unable to allocate > > memory. While this is unlikely to happen during boot (called from > > init_{,local_}irq_data()), it is better to harden the code by > > propagting the return value. > > > > Spotted by coverity. > > > > CID: 106529 > > > > Signed-off-by: Julien Grall > > Reviewed-by: Roger Paul Monné > > Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini > > --- > > Changes in v2: > > - Add Roger's reviewed-by for x86 > > - Handle > > --- > > xen/arch/arm/irq.c | 12 ++++++++++-- > > xen/arch/x86/irq.c | 7 ++++++- > > 2 files changed, 16 insertions(+), 3 deletions(-) > > > > diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c > > index 3877657a5277..b71b099e6fa2 100644 > > --- a/xen/arch/arm/irq.c > > +++ b/xen/arch/arm/irq.c > > @@ -88,7 +88,11 @@ static int __init init_irq_data(void) > > for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ ) > > { > > struct irq_desc *desc = irq_to_desc(irq); > > - init_one_irq_desc(desc); > > + int rc = init_one_irq_desc(desc); > > + > > + if ( rc ) > > + return rc; > > + > > desc->irq = irq; > > desc->action = NULL; > > } > > @@ -105,7 +109,11 @@ static int init_local_irq_data(void) > > for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ ) > > { > > struct irq_desc *desc = irq_to_desc(irq); > > - init_one_irq_desc(desc); > > + int rc = init_one_irq_desc(desc); > > + > > + if ( rc ) > > + return rc; > > + > > desc->irq = irq; > > desc->action = NULL; > > > > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c > > index 45966947919e..3ebd684415ac 100644 > > --- a/xen/arch/x86/irq.c > > +++ b/xen/arch/x86/irq.c > > @@ -428,9 +428,14 @@ int __init init_irq_data(void) > > > > for ( irq = 0; irq < nr_irqs_gsi; irq++ ) > > { > > + int rc; > > + > > desc = irq_to_desc(irq); > > desc->irq = irq; > > - init_one_irq_desc(desc); > > + > > + rc = init_one_irq_desc(desc); > > + if ( rc ) > > + return rc; > > } > > for ( ; irq < nr_irqs; irq++ ) > > irq_to_desc(irq)->irq = irq; > > -- > > 2.17.1 > > > > > >