Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966193AbbDWAuq (ORCPT ); Wed, 22 Apr 2015 20:50:46 -0400 Received: from mail-ie0-f170.google.com ([209.85.223.170]:34214 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934324AbbDWAun (ORCPT ); Wed, 22 Apr 2015 20:50:43 -0400 From: Jin Qian To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jin Qian Subject: [PATCH 1/3] power: validate wakeup source before activating it. Date: Wed, 22 Apr 2015 17:50:10 -0700 Message-Id: <1429750212-28659-2-git-send-email-jinqian@android.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1429750212-28659-1-git-send-email-jinqian@android.com> References: <1429750212-28659-1-git-send-email-jinqian@android.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1900 Lines: 61 A rogue wakeup source not registered in wakeup_sources list is not visible from wakeup_sources_stats_show. Check if the wakeup source is registered properly by looking at the timer function. Signed-off-by: Jin Qian --- drivers/base/power/wakeup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 7726200..f24c622 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "power.h" @@ -351,6 +352,19 @@ int device_set_wakeup_enable(struct device *dev, bool enable) } EXPORT_SYMBOL_GPL(device_set_wakeup_enable); +/** + * validate_wakeup_source - validate the given wakeup source. + * @ws: Wakeup source to be validated. + */ +static bool validate_wakeup_source(struct wakeup_source *ws) +{ + /* + * Use timer function to check if the given source is initialized + * by wakeup_source_add. + */ + return ws->timer.function == pm_wakeup_timer_fn; +} + /* * The functions below use the observation that each wakeup event starts a * period in which the system should not be suspended. The moment this period @@ -391,6 +405,11 @@ static void wakeup_source_activate(struct wakeup_source *ws) { unsigned int cec; + if (!validate_wakeup_source(ws)) { + pr_err("unregistered wakeup source: %s\n", ws->name); + return; + } + /* * active wakeup source should bring the system * out of PM_SUSPEND_FREEZE state -- 2.2.0.rc0.207.ga3a616c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/