From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127AbbKLS1D (ORCPT ); Thu, 12 Nov 2015 13:27:03 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:35556 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbbKLS1A (ORCPT ); Thu, 12 Nov 2015 13:27:00 -0500 Date: Thu, 12 Nov 2015 10:26:57 -0800 From: Dmitry Torokhov To: "Rafael J. Wysocki" Cc: Greg Kroah-Hartman , Tony Lindgren , Grygorii Strashko , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PM / wakeirq: check that wake IRQ is valid before accepting it Message-ID: <20151112182657.GA19785@dtor-ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) + 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