From: Russell King <rmk+kernel@arm.linux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Len Brown <len.brown@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pm@vger.kernel.org
Subject: [PATCH 2/8] pm: domains: avoid potential oops in pm_genpd_remove_device()
Date: Sat, 14 Feb 2015 15:27:35 +0000 [thread overview]
Message-ID: <E1YMed5-00054V-QK@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20150214152659.GI8656@n2100.arm.linux.org.uk>
pm_genpd_remove_device() should only be called with valid and present
pm domain. There are circumstances where we may end up with something
that isn't a generic PM domain in dev->pm_domain (eg, vga_switcheroo
stuff.)
Acked-by: Rafael J. Wysocki <rjw@rjwysocki.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/base/power/domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index b3fbc21da2dc..11a1023fa64a 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1509,7 +1509,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
dev_dbg(dev, "%s()\n", __func__);
- if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)
+ if (!pm_genpd_present(genpd) || IS_ERR_OR_NULL(dev)
|| IS_ERR_OR_NULL(dev->pm_domain)
|| pd_to_genpd(dev->pm_domain) != genpd)
return -EINVAL;
--
1.8.3.1
next prev parent reply other threads:[~2015-02-14 15:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 15:26 [FOR DISCUSSION 0/8] Dove PMU support Russell King - ARM Linux
2015-02-14 15:27 ` [PATCH 1/8] pm: domains: quieten down generic pm domains Russell King
2015-02-14 15:27 ` Russell King [this message]
2015-02-14 15:27 ` [PATCH 3/8] pm: domains: sync runtime PM status with PM domains Russell King
2015-02-15 4:24 ` Ulf Hansson
2015-02-17 18:53 ` Rafael J. Wysocki
2015-02-17 19:42 ` Alan Stern
2015-02-17 19:42 ` Russell King - ARM Linux
2015-02-18 7:02 ` Rafael J. Wysocki
2015-02-18 10:03 ` Russell King - ARM Linux
2015-02-18 15:12 ` Alan Stern
2015-02-18 15:42 ` Russell King - ARM Linux
2015-02-18 16:52 ` Rafael J. Wysocki
2015-02-18 17:26 ` Russell King - ARM Linux
2015-02-18 18:05 ` Rafael J. Wysocki
2015-03-04 19:57 ` Ulf Hansson
2015-03-04 20:11 ` Russell King - ARM Linux
2015-02-18 18:42 ` Alan Stern
2015-02-18 16:46 ` Rafael J. Wysocki
2015-02-14 16:49 ` [FOR DISCUSSION 0/8] Dove PMU support Andrew Lunn
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=E1YMed5-00054V-QK@rmk-PC.arm.linux.org.uk \
--to=rmk+kernel@arm.linux.org.uk \
--cc=andrew@lunn.ch \
--cc=gregkh@linuxfoundation.org \
--cc=jason@lakedaemon.net \
--cc=len.brown@intel.com \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sebastian.hesselbarth@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).