lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 16 Jan 2020 12:22:33 -0500 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: Stephen Boyd <swboyd@...omium.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Tri Vo <trong@...roid.com>, Kalesh Singh <kaleshsingh@...gle.com>, Ravi Chandra Sadineni <ravisadineni@...omium.org>, Viresh Kumar <viresh.kumar@...aro.org>, "Rafael J . Wysocki" <rafael.j.wysocki@...el.com>, Sebastian Reichel <sebastian.reichel@...labora.com>, Sasha Levin <sashal@...nel.org>, linux-pm@...r.kernel.org Subject: [PATCH AUTOSEL 4.14 281/371] power: supply: Init device wakeup after device_add() From: Stephen Boyd <swboyd@...omium.org> [ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ] We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister(). Let's change the order of operations so we don't run into problems here. Fixes: 948dcf966228 ("power_supply: Prevent suspend until power supply events are processed") Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Cc: Tri Vo <trong@...roid.com> Cc: Kalesh Singh <kaleshsingh@...gle.com> Cc: Ravi Chandra Sadineni <ravisadineni@...omium.org> Cc: Viresh Kumar <viresh.kumar@...aro.org> Signed-off-by: Stephen Boyd <swboyd@...omium.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@...labora.com> Signed-off-by: Sasha Levin <sashal@...nel.org> --- drivers/power/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 3226faebe0a0..0f1a0efd5926 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -891,14 +891,14 @@ __power_supply_register(struct device *parent, } spin_lock_init(&psy->changed_lock); - rc = device_init_wakeup(dev, ws); - if (rc) - goto wakeup_init_failed; - rc = device_add(dev); if (rc) goto device_add_failed; + rc = device_init_wakeup(dev, ws); + if (rc) + goto wakeup_init_failed; + rc = psy_register_thermal(psy); if (rc) goto register_thermal_failed; @@ -935,8 +935,8 @@ __power_supply_register(struct device *parent, psy_unregister_thermal(psy); register_thermal_failed: device_del(dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed: put_device(dev); -- 2.20.1
Powered by blists - more mailing lists