Linux-PM Archive on lore.kernel.org
 help / color / Atom feed
From: Eduardo Valentin <edubezval@gmail.com>
To: Rui Zhang <rui.zhang@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Linux PM <linux-pm@vger.kernel.org>,
	Eduardo Valentin <edubezval@gmail.com>
Subject: [PATCHv2 01/49] thermal: core: prevent zones with no types to be registered
Date: Mon,  7 Nov 2016 21:08:39 -0800
Message-ID: <1478581767-7009-2-git-send-email-edubezval@gmail.com> (raw)
In-Reply-To: <1478581767-7009-1-git-send-email-edubezval@gmail.com>

There are APIs that rely on tz->type. This patch
prevent thermal zones without it to be registered.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
 drivers/thermal/thermal_core.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 226b0b4ac..ec0d158 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1873,6 +1873,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
 	int passive = 0;
 	struct thermal_governor *governor;
 
+	if (!type || strlen(type) == 0)
+		return ERR_PTR(-EINVAL);
+
 	if (type && strlen(type) >= THERMAL_NAME_LENGTH)
 		return ERR_PTR(-EINVAL);
 
@@ -1898,7 +1901,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
 		return ERR_PTR(result);
 	}
 
-	strlcpy(tz->type, type ? : "", sizeof(tz->type));
+	strlcpy(tz->type, type, sizeof(tz->type));
 	tz->ops = ops;
 	tz->tzp = tzp;
 	tz->device.class = &thermal_class;
@@ -1918,11 +1921,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
 	}
 
 	/* sys I/F */
-	if (type) {
-		result = device_create_file(&tz->device, &dev_attr_type);
-		if (result)
-			goto unregister;
-	}
+	result = device_create_file(&tz->device, &dev_attr_type);
+	if (result)
+		goto unregister;
 
 	result = device_create_file(&tz->device, &dev_attr_temp);
 	if (result)
@@ -2071,8 +2072,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 
 	thermal_zone_device_set_polling(tz, 0);
 
-	if (tz->type[0])
-		device_remove_file(&tz->device, &dev_attr_type);
+	device_remove_file(&tz->device, &dev_attr_type);
 	device_remove_file(&tz->device, &dev_attr_temp);
 	if (tz->ops->get_mode)
 		device_remove_file(&tz->device, &dev_attr_mode);
-- 
2.1.4

  reply index

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-08  5:08 [PATCHv2 00/49] thermal: reorganizing thermal core Eduardo Valentin
2016-11-08  5:08 ` Eduardo Valentin [this message]
2016-11-08  5:08 ` [PATCHv2 02/49] thermal: core: group thermal_zone DEVICE_ATTR's declarations Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 03/49] thermal: core: group device_create_file() calls that are always created Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 04/49] thermal: core: use dev.groups to manage always present tz attributes Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 05/49] thermal: core: move emul_temp creation to tz->device.groups Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 06/49] thermal: core: move mode attribute " Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 07/49] thermal: core: move passive attr " Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 08/49] thermal: core: improve power actor documentation Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 09/49] thermal: core: move power actor code out of sysfs I/F section Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 10/49] thermal: core: remove useless empty line Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 11/49] thermal: core: fix style on remove_trip_attrs() Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 12/49] thermal: core: move the trip attrs to the tz sysfs I/F section Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 13/49] thermal: core: create tz->device.groups dynamically Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 14/49] thermal: core: move trips attributes to tz->device.groups Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 15/49] thermal: core: remove unnecessary device_remove() calls Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 16/49] thermal: core: split passive_store Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 17/49] thermal: core: split policy_store Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 18/49] thermal: core: split available_policies_show() Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 19/49] thermal: core: move to_thermal_zone() macro to header file Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 20/49] thermal: core: treat correctly the return value of *scanf calls Eduardo Valentin
2016-11-08  5:08 ` [PATCHv2 21/49] thermal: core: match parenthesis on code alignment Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 22/49] thermal: core: move thermal_zone sysfs to thermal_sysfs.c Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 23/49] thermal: core: move to_cooling_device macro to header file Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 24/49] thermal: core: move cooling device sysfs to thermal_sysfs.c Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 25/49] thermal: core: remove a couple of style issues on helpers Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 26/49] thermal: core: introduce thermal_helpers.c Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 27/49] thermal: core: group functions related to governor handling Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 28/49] thermal: core: move idr handling to device management section Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 29/49] thermal: core: small style fix on __unbind() helper Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 30/49] thermal: core: move __unbind() helper to where it is used Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 31/49] thermal: core: move bind_cdev() " Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 32/49] thermal: core: move bind_tz() " Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 33/49] thermal: core: fix couple of style issues on __bind() helper Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 34/49] thermal: core: move __bind() to where it is used Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 35/49] thermal: core: add inline to print_bind_err_msg() Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 36/49] thermal: core: move notify to the zone update section Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 37/49] thermal: core: add a comment describing the main update loop Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 38/49] thermal: core: add a comment describing the power actor section Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 39/49] thermal: core: add a comment describing the device management section Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 40/49] thermal: sysfs: remove symbols of emul_temp when config is disabled Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 41/49] thermal: core: remove FSF address in the GPL notice Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 42/49] thermal: core: small style fix when checking for __find_governor() Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 43/49] thermal: core: standardize line breaking alignment Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 44/49] thermal: core: remove void function return statements Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 45/49] thermal: core: remove style warnings and checks Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 46/49] thermal: core: improve kerneldoc entry of thermal_cooling_device_unregister Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 47/49] thermal: core: use kzalloc(sizeof(*ptr),...) Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 48/49] thermal: sysfs: use kcalloc() instead of kzalloc() Eduardo Valentin
2016-11-08  5:09 ` [PATCHv2 49/49] thermal: core: move slop and offset helpers to thermal_helpers.c Eduardo Valentin

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=1478581767-7009-2-git-send-email-edubezval@gmail.com \
    --to=edubezval@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rui.zhang@intel.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

Linux-PM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-pm/0 linux-pm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pm linux-pm/ https://lore.kernel.org/linux-pm \
		linux-pm@vger.kernel.org
	public-inbox-index linux-pm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git