From: Jin Qian <jinqian@android.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Pavel Machek <pavel@ucw.cz>, Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jin Qian <jinqian@android.com>
Subject: [PATCH v2 1/3] power: validate wakeup source before activating it.
Date: Tue, 5 May 2015 15:24:13 -0700 [thread overview]
Message-ID: <1430864653-5582-1-git-send-email-jinqian@android.com> (raw)
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 <jinqian@android.com>
---
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..5d866b9 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -14,6 +14,7 @@
#include <linux/suspend.h>
#include <linux/seq_file.h>
#include <linux/debugfs.h>
+#include <linux/types.h>
#include <trace/events/power.h>
#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 (WARN_ON(!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
next reply other threads:[~2015-05-05 22:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 22:24 Jin Qian [this message]
2015-05-05 23:16 ` [PATCH v2 1/3] power: validate wakeup source before activating it Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2015-05-06 18:51 Jin Qian
2015-05-06 22:00 ` Rafael J. Wysocki
2015-05-06 22:11 ` Jin Qian
2015-05-06 22:39 ` Rafael J. Wysocki
2015-05-06 22:24 ` Jin Qian
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=1430864653-5582-1-git-send-email-jinqian@android.com \
--to=jinqian@android.com \
--cc=gregkh@linuxfoundation.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox