From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it Date: Thu, 12 Nov 2015 10:52:11 -0800 Message-ID: <20151112185211.GB8494@dtor-ws> References: <20151112182657.GA19785@dtor-ws> <5644DD73.2090904@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pa0-f51.google.com ([209.85.220.51]:36766 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078AbbKLSwO (ORCPT ); Thu, 12 Nov 2015 13:52:14 -0500 Content-Disposition: inline In-Reply-To: <5644DD73.2090904@ti.com> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Grygorii Strashko Cc: "Rafael J. Wysocki" , Greg Kroah-Hartman , Tony Lindgren , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org 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 > >--- > > > >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