Commit da5aae70 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Fix sysdev class file creation. 



Use sysdev_class_create_file() to create create sysdev class attributes
instead of sysfs_create_file(). Using sysfs_create_file() wasn't a very
good idea since the show and store functions have a different amount of
parameters for sysfs files and sysdev class files.
In particular the pointer to the buffer is the last argument and
therefore accesses to random memory regions happened.
Still worked surprisingly well until we got a kernel panic.

Cc: stable@kernel.org
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 250cf776

arch/s390/kernel/smp.c

+9 −15
Original line number Diff line number Diff line
@@ -1119,9 +1119,7 @@ out: 
	return rc;

}



static ssize_t __ref rescan_store(struct sys_device *dev,

				  struct sysdev_attribute *attr,

				  const char *buf,

static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,

				  size_t count)

{

	int rc;
@@ -1129,12 +1127,10 @@ static ssize_t __ref rescan_store(struct sys_device *dev, 
	rc = smp_rescan_cpus();

	return rc ? rc : count;

}

static SYSDEV_ATTR(rescan, 0200, NULL, rescan_store);

static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);

#endif /* CONFIG_HOTPLUG_CPU */



static ssize_t dispatching_show(struct sys_device *dev,

				struct sysdev_attribute *attr,

				char *buf)

static ssize_t dispatching_show(struct sysdev_class *class, char *buf)

{

	ssize_t count;
@@ -1144,9 +1140,8 @@ static ssize_t dispatching_show(struct sys_device *dev, 
	return count;

}



static ssize_t dispatching_store(struct sys_device *dev,

				 struct sysdev_attribute *attr,

				 const char *buf, size_t count)

static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf,

				 size_t count)

{

	int val, rc;

	char delim;
@@ -1168,7 +1163,8 @@ out: 
	put_online_cpus();

	return rc ? rc : count;

}

static SYSDEV_ATTR(dispatching, 0644, dispatching_show, dispatching_store);

static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,

			 dispatching_store);



static int __init topology_init(void)

{
@@ -1178,13 +1174,11 @@ static int __init topology_init(void) 
	register_cpu_notifier(&smp_cpu_nb);



#ifdef CONFIG_HOTPLUG_CPU

	rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,

			       &attr_rescan.attr);

	rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan);

	if (rc)

		return rc;

#endif

	rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,

			       &attr_dispatching.attr);

	rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching);

	if (rc)

		return rc;

	for_each_present_cpu(cpu) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE