* [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero [not found] <20190516114107.8963-1-sashal@kernel.org> @ 2019-05-16 11:40 ` Sasha Levin 2019-05-16 11:40 ` Sasha Levin 2019-05-19 21:31 ` Pavel Machek 2019-05-16 11:41 ` [PATCH AUTOSEL 4.14 11/16] power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG Sasha Levin 1 sibling, 2 replies; 6+ messages in thread From: Sasha Levin @ 2019-05-16 11:40 UTC (permalink / raw) To: linux-kernel, stable Cc: Tony Lindgren, Pavel Machek, Sebastian Reichel, Sasha Levin, linux-pm From: Tony Lindgren <tony@atomide.com> [ Upstream commit dbe7208c6c4aec083571f2ec742870a0d0edbea3 ] If called fast enough so samples do not increment, we can get division by zero in kernel: __div0 cpcap_battery_cc_raw_div cpcap_battery_get_property power_supply_get_property.part.1 power_supply_get_property power_supply_show_property power_supply_uevent Fixes: 874b2adbed12 ("power: supply: cpcap-battery: Add a battery driver") Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/power/supply/cpcap-battery.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c index ee71a2b37b12c..fe7fcf3a2ad03 100644 --- a/drivers/power/supply/cpcap-battery.c +++ b/drivers/power/supply/cpcap-battery.c @@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata, int avg_current; u32 cc_lsb; + if (!divider) + return 0; + sample &= 0xffffff; /* 24-bits, unsigned */ offset &= 0x7ff; /* 10-bits, signed */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero 2019-05-16 11:40 ` [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero Sasha Levin @ 2019-05-16 11:40 ` Sasha Levin 2019-05-19 21:31 ` Pavel Machek 1 sibling, 0 replies; 6+ messages in thread From: Sasha Levin @ 2019-05-16 11:40 UTC (permalink / raw) To: linux-kernel, stable Cc: Tony Lindgren, Pavel Machek, Sebastian Reichel, Sasha Levin, linux-pm From: Tony Lindgren <tony@atomide.com> [ Upstream commit dbe7208c6c4aec083571f2ec742870a0d0edbea3 ] If called fast enough so samples do not increment, we can get division by zero in kernel: __div0 cpcap_battery_cc_raw_div cpcap_battery_get_property power_supply_get_property.part.1 power_supply_get_property power_supply_show_property power_supply_uevent Fixes: 874b2adbed12 ("power: supply: cpcap-battery: Add a battery driver") Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/power/supply/cpcap-battery.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c index ee71a2b37b12c..fe7fcf3a2ad03 100644 --- a/drivers/power/supply/cpcap-battery.c +++ b/drivers/power/supply/cpcap-battery.c @@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata, int avg_current; u32 cc_lsb; + if (!divider) + return 0; + sample &= 0xffffff; /* 24-bits, unsigned */ offset &= 0x7ff; /* 10-bits, signed */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero 2019-05-16 11:40 ` [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero Sasha Levin 2019-05-16 11:40 ` Sasha Levin @ 2019-05-19 21:31 ` Pavel Machek 2019-05-19 21:31 ` Pavel Machek 1 sibling, 1 reply; 6+ messages in thread From: Pavel Machek @ 2019-05-19 21:31 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Tony Lindgren, Sebastian Reichel, linux-pm [-- Attachment #1: Type: text/plain, Size: 1001 bytes --] On Thu 2019-05-16 07:40:57, Sasha Levin wrote: > From: Tony Lindgren <tony@atomide.com> > > [ Upstream commit dbe7208c6c4aec083571f2ec742870a0d0edbea3 ] > > If called fast enough so samples do not increment, we can get > division by zero in kernel: > > __div0 > cpcap_battery_cc_raw_div > cpcap_battery_get_property > power_supply_get_property.part.1 > power_supply_get_property > power_supply_show_property > power_supply_uevent > > Fixes: 874b2adbed12 ("power: supply: cpcap-battery: Add a battery driver") > Signed-off-by: Tony Lindgren <tony@atomide.com> > Acked-by: Pavel Machek <pavel@ucw.cz> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> Yup, this one makes sense for stable Acked-for-stable-by: Pavel Machek <pavel@ucw.cz> Thanks, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero 2019-05-19 21:31 ` Pavel Machek @ 2019-05-19 21:31 ` Pavel Machek 0 siblings, 0 replies; 6+ messages in thread From: Pavel Machek @ 2019-05-19 21:31 UTC (permalink / raw) To: Sasha Levin Cc: linux-kernel, stable, Tony Lindgren, Sebastian Reichel, linux-pm [-- Attachment #1: Type: text/plain, Size: 1001 bytes --] On Thu 2019-05-16 07:40:57, Sasha Levin wrote: > From: Tony Lindgren <tony@atomide.com> > > [ Upstream commit dbe7208c6c4aec083571f2ec742870a0d0edbea3 ] > > If called fast enough so samples do not increment, we can get > division by zero in kernel: > > __div0 > cpcap_battery_cc_raw_div > cpcap_battery_get_property > power_supply_get_property.part.1 > power_supply_get_property > power_supply_show_property > power_supply_uevent > > Fixes: 874b2adbed12 ("power: supply: cpcap-battery: Add a battery driver") > Signed-off-by: Tony Lindgren <tony@atomide.com> > Acked-by: Pavel Machek <pavel@ucw.cz> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> Yup, this one makes sense for stable Acked-for-stable-by: Pavel Machek <pavel@ucw.cz> Thanks, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 181 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH AUTOSEL 4.14 11/16] power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG [not found] <20190516114107.8963-1-sashal@kernel.org> 2019-05-16 11:40 ` [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero Sasha Levin @ 2019-05-16 11:41 ` Sasha Levin 2019-05-16 11:41 ` Sasha Levin 1 sibling, 1 reply; 6+ messages in thread From: Sasha Levin @ 2019-05-16 11:41 UTC (permalink / raw) To: linux-kernel, stable Cc: Andrey Smirnov, Chris Healy, linux-pm, Sebastian Reichel, Sasha Levin From: Andrey Smirnov <andrew.smirnov@gmail.com> [ Upstream commit 349ced9984ff540ce74ca8a0b2e9b03dc434b9dd ] Fix a similar endless event loop as was done in commit 8dcf32175b4e ("i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE"): The culprit is the dev_dbg printk in the i2c uevent handler. If this is activated (for instance by CONFIG_I2C_DEBUG_CORE) it results in an endless loop with systemd-journald. This happens if user-space scans the system log and reads the uevent file to get information about a newly created device, which seems fair use to me. Unfortunately reading the "uevent" file uses the same function that runs for creating the uevent for a new device, generating the next syslog entry Both CONFIG_I2C_DEBUG_CORE and CONFIG_POWER_SUPPLY_DEBUG were reported in https://bugs.freedesktop.org/show_bug.cgi?id=76886 but only former seems to have been fixed. Drop debug prints as it was done in I2C subsystem to resolve the issue. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Chris Healy <cphealy@gmail.com> Cc: linux-pm@vger.kernel.org Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/power/supply/power_supply_sysfs.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 5204f115970fe..eb5dc74820539 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -325,15 +325,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) char *prop_buf; char *attrname; - dev_dbg(dev, "uevent\n"); - if (!psy || !psy->desc) { dev_dbg(dev, "No power supply yet\n"); return ret; } - dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name); - ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name); if (ret) return ret; @@ -369,8 +365,6 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) goto out; } - dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf); - ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf); kfree(attrname); if (ret) -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH AUTOSEL 4.14 11/16] power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG 2019-05-16 11:41 ` [PATCH AUTOSEL 4.14 11/16] power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG Sasha Levin @ 2019-05-16 11:41 ` Sasha Levin 0 siblings, 0 replies; 6+ messages in thread From: Sasha Levin @ 2019-05-16 11:41 UTC (permalink / raw) To: linux-kernel, stable Cc: Andrey Smirnov, Chris Healy, linux-pm, Sebastian Reichel, Sasha Levin From: Andrey Smirnov <andrew.smirnov@gmail.com> [ Upstream commit 349ced9984ff540ce74ca8a0b2e9b03dc434b9dd ] Fix a similar endless event loop as was done in commit 8dcf32175b4e ("i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE"): The culprit is the dev_dbg printk in the i2c uevent handler. If this is activated (for instance by CONFIG_I2C_DEBUG_CORE) it results in an endless loop with systemd-journald. This happens if user-space scans the system log and reads the uevent file to get information about a newly created device, which seems fair use to me. Unfortunately reading the "uevent" file uses the same function that runs for creating the uevent for a new device, generating the next syslog entry Both CONFIG_I2C_DEBUG_CORE and CONFIG_POWER_SUPPLY_DEBUG were reported in https://bugs.freedesktop.org/show_bug.cgi?id=76886 but only former seems to have been fixed. Drop debug prints as it was done in I2C subsystem to resolve the issue. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Chris Healy <cphealy@gmail.com> Cc: linux-pm@vger.kernel.org Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/power/supply/power_supply_sysfs.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 5204f115970fe..eb5dc74820539 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -325,15 +325,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) char *prop_buf; char *attrname; - dev_dbg(dev, "uevent\n"); - if (!psy || !psy->desc) { dev_dbg(dev, "No power supply yet\n"); return ret; } - dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name); - ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name); if (ret) return ret; @@ -369,8 +365,6 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) goto out; } - dev_dbg(dev, "prop %s=%s\n", attrname, prop_buf); - ret = add_uevent_var(env, "POWER_SUPPLY_%s=%s", attrname, prop_buf); kfree(attrname); if (ret) -- 2.20.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-19 21:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190516114107.8963-1-sashal@kernel.org>
2019-05-16 11:40 ` [PATCH AUTOSEL 4.14 06/16] power: supply: cpcap-battery: Fix division by zero Sasha Levin
2019-05-16 11:40 ` Sasha Levin
2019-05-19 21:31 ` Pavel Machek
2019-05-19 21:31 ` Pavel Machek
2019-05-16 11:41 ` [PATCH AUTOSEL 4.14 11/16] power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG Sasha Levin
2019-05-16 11:41 ` Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox