[PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it

[PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it

[Dmitry Torokhov]

Check that IRQ number passed to dev_pm_set_wake_irq and
dev_pm_set_dedicated_wake_irq is valid (not negative) before accepting it.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

My recent change to i2c core introduced a code path that led to calling
dev_pm_set_wake_irq(&client->dev, -ENOENT), which succeeded but
obviously did the wrong thing. Checking the IRQ and bailing out early
would have helped noticing this issue earlier.

 drivers/base/power/wakeirq.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
index eb6e674..0d77cd6 100644
--- a/drivers/base/power/wakeirq.c
+++ b/drivers/base/power/wakeirq.c
@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
 	struct wake_irq *wirq;
 	int err;
 
+	if (irq < 0)
+		return -EINVAL;
+
 	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
 	if (!wirq)
 		return -ENOMEM;
@@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
 	struct wake_irq *wirq;
 	int err;
 
+	if (irq < 0)
+		return -EINVAL;
+
 	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
 	if (!wirq)
 		return -ENOMEM;
-- 
2.6.0.rc2.230.g3dd15c0


-- 
Dmitry

Re: [PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it

[Grygorii Strashko]

On 11/12/2015 08:26 PM, Dmitry Torokhov wrote:
> Check that IRQ number passed to dev_pm_set_wake_irq and
> dev_pm_set_dedicated_wake_irq is valid (not negative) before accepting it.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>
> My recent change to i2c core introduced a code path that led to calling
> dev_pm_set_wake_irq(&client->dev, -ENOENT), which succeeded but
> obviously did the wrong thing. Checking the IRQ and bailing out early
> would have helped noticing this issue earlier.
>
>   drivers/base/power/wakeirq.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
> index eb6e674..0d77cd6 100644
> --- a/drivers/base/power/wakeirq.c
> +++ b/drivers/base/power/wakeirq.c
> @@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
>   	struct wake_irq *wirq;
>   	int err;
>
> +	if (irq < 0)

<= 0 ?

> +		return -EINVAL;
> +
>   	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
>   	if (!wirq)
>   		return -ENOMEM;
> @@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
>   	struct wake_irq *wirq;
>   	int err;
>
> +	if (irq < 0)
> +		return -EINVAL;
> +
>   	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
>   	if (!wirq)
>   		return -ENOMEM;
>


-- 
regards,
-grygorii

Re: [PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it

[Dmitry Torokhov]

On Thu, Nov 12, 2015 at 08:41:55PM +0200, Grygorii Strashko wrote:
> On 11/12/2015 08:26 PM, Dmitry Torokhov wrote:
> >Check that IRQ number passed to dev_pm_set_wake_irq and
> >dev_pm_set_dedicated_wake_irq is valid (not negative) before accepting it.
> >
> >Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> >---
> >
> >My recent change to i2c core introduced a code path that led to calling
> >dev_pm_set_wake_irq(&client->dev, -ENOENT), which succeeded but
> >obviously did the wrong thing. Checking the IRQ and bailing out early
> >would have helped noticing this issue earlier.
> >
> >  drivers/base/power/wakeirq.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> >diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
> >index eb6e674..0d77cd6 100644
> >--- a/drivers/base/power/wakeirq.c
> >+++ b/drivers/base/power/wakeirq.c
> >@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
> >  	struct wake_irq *wirq;
> >  	int err;
> >
> >+	if (irq < 0)
> 
> <= 0 ?

Maybe. I am still confused whether we treat 0 as invalid or not.

> 
> >+		return -EINVAL;
> >+
> >  	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
> >  	if (!wirq)
> >  		return -ENOMEM;
> >@@ -167,6 +170,9 @@ int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)
> >  	struct wake_irq *wirq;
> >  	int err;
> >
> >+	if (irq < 0)
> >+		return -EINVAL;
> >+
> >  	wirq = kzalloc(sizeof(*wirq), GFP_KERNEL);
> >  	if (!wirq)
> >  		return -ENOMEM;
> >
> 
> 
> -- 
> regards,
> -grygorii

-- 
Dmitry

Re: [PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it

[Rafael J. Wysocki]

On Thursday, November 12, 2015 10:52:11 AM Dmitry Torokhov wrote:
> On Thu, Nov 12, 2015 at 08:41:55PM +0200, Grygorii Strashko wrote:
> > On 11/12/2015 08:26 PM, Dmitry Torokhov wrote:
> > >Check that IRQ number passed to dev_pm_set_wake_irq and
> > >dev_pm_set_dedicated_wake_irq is valid (not negative) before accepting it.
> > >
> > >Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > >---
> > >
> > >My recent change to i2c core introduced a code path that led to calling
> > >dev_pm_set_wake_irq(&client->dev, -ENOENT), which succeeded but
> > >obviously did the wrong thing. Checking the IRQ and bailing out early
> > >would have helped noticing this issue earlier.
> > >
> > >  drivers/base/power/wakeirq.c | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > >
> > >diff --git a/drivers/base/power/wakeirq.c b/drivers/base/power/wakeirq.c
> > >index eb6e674..0d77cd6 100644
> > >--- a/drivers/base/power/wakeirq.c
> > >+++ b/drivers/base/power/wakeirq.c
> > >@@ -68,6 +68,9 @@ int dev_pm_set_wake_irq(struct device *dev, int irq)
> > >  	struct wake_irq *wirq;
> > >  	int err;
> > >
> > >+	if (irq < 0)
> > 
> > <= 0 ?
> 
> Maybe. I am still confused whether we treat 0 as invalid or not.

Well, it all boils down to whether or not IRQ 0 may be a valid wakeup IRQ
on any architectures.

In any case, though, we can add that check later, so I'll apply the patch
as is.

Thanks,
Rafael