All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>,
	lokeshvutla@ti.com, tglx@linutronix.de, jason@lakedaemon.net
Cc: nm@ti.com, t-kristo@ti.com, ssantosh@kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] irqchip: ti-sci-inta: Fix kernel crash if irq_create_fwspec_mapping fail
Date: Tue, 4 Jun 2019 11:32:43 +0100	[thread overview]
Message-ID: <b2e32aa1-3f85-cbd2-d0b4-4eb67c681513@arm.com> (raw)
In-Reply-To: <20190604101751.8265-1-peter.ujfalusi@ti.com>

On 04/06/2019 11:17, Peter Ujfalusi wrote:
> irq_create_fwspec_mapping() can fail, returning 0 as parent_virq. In this
> case vint_desc is going to be NULL in ti_sci_inta_alloc_irq() which will
> cause NULL pointer dereference.
> 
> Also note that irq_create_fwspec_mapping() returns 'unsigned int' so the
> check '<=' was wrong.
> 
> Use -EINVAL if irq_create_fwspec_mapping() returned with 0.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  drivers/irqchip/irq-ti-sci-inta.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
> index 011b60a49e3f..ef4d625d2d80 100644
> --- a/drivers/irqchip/irq-ti-sci-inta.c
> +++ b/drivers/irqchip/irq-ti-sci-inta.c
> @@ -159,9 +159,9 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
>  	parent_fwspec.param[1] = vint_desc->vint_id;
>  
>  	parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
> -	if (parent_virq <= 0) {
> +	if (parent_virq == 0) {
>  		kfree(vint_desc);
> -		return ERR_PTR(parent_virq);
> +		return ERR_PTR(-EINVAL);
>  	}
>  	vint_desc->parent_virq = parent_virq;
>  
> 

Nice one. I've queued it as part of the stuff I need to send to Thomas
at the end of the week.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...

WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <marc.zyngier@arm.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>,
	lokeshvutla@ti.com, tglx@linutronix.de, jason@lakedaemon.net
Cc: nm@ti.com, t-kristo@ti.com, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, ssantosh@kernel.org
Subject: Re: [PATCH] irqchip: ti-sci-inta: Fix kernel crash if irq_create_fwspec_mapping fail
Date: Tue, 4 Jun 2019 11:32:43 +0100	[thread overview]
Message-ID: <b2e32aa1-3f85-cbd2-d0b4-4eb67c681513@arm.com> (raw)
In-Reply-To: <20190604101751.8265-1-peter.ujfalusi@ti.com>

On 04/06/2019 11:17, Peter Ujfalusi wrote:
> irq_create_fwspec_mapping() can fail, returning 0 as parent_virq. In this
> case vint_desc is going to be NULL in ti_sci_inta_alloc_irq() which will
> cause NULL pointer dereference.
> 
> Also note that irq_create_fwspec_mapping() returns 'unsigned int' so the
> check '<=' was wrong.
> 
> Use -EINVAL if irq_create_fwspec_mapping() returned with 0.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  drivers/irqchip/irq-ti-sci-inta.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
> index 011b60a49e3f..ef4d625d2d80 100644
> --- a/drivers/irqchip/irq-ti-sci-inta.c
> +++ b/drivers/irqchip/irq-ti-sci-inta.c
> @@ -159,9 +159,9 @@ static struct ti_sci_inta_vint_desc *ti_sci_inta_alloc_parent_irq(struct irq_dom
>  	parent_fwspec.param[1] = vint_desc->vint_id;
>  
>  	parent_virq = irq_create_fwspec_mapping(&parent_fwspec);
> -	if (parent_virq <= 0) {
> +	if (parent_virq == 0) {
>  		kfree(vint_desc);
> -		return ERR_PTR(parent_virq);
> +		return ERR_PTR(-EINVAL);
>  	}
>  	vint_desc->parent_virq = parent_virq;
>  
> 

Nice one. I've queued it as part of the stuff I need to send to Thomas
at the end of the week.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2019-06-04 10:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-04 10:17 [PATCH] irqchip: ti-sci-inta: Fix kernel crash if irq_create_fwspec_mapping fail Peter Ujfalusi
2019-06-04 10:17 ` Peter Ujfalusi
2019-06-04 10:32 ` Marc Zyngier [this message]
2019-06-04 10:32   ` Marc Zyngier

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=b2e32aa1-3f85-cbd2-d0b4-4eb67c681513@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lokeshvutla@ti.com \
    --cc=nm@ti.com \
    --cc=peter.ujfalusi@ti.com \
    --cc=ssantosh@kernel.org \
    --cc=t-kristo@ti.com \
    --cc=tglx@linutronix.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.