Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f2817a authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files

[PATCH] sysfs: (rest) if show/store is missing return -EIO 



sysfs: fix the rest of the kernel so if an attribute doesn't
       implement show or store method read/write will return
       -EIO instead of 0 or -EINVAL or -EPERM.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6c1852a0

drivers/acpi/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -65,14 +65,14 @@ static ssize_t acpi_device_attr_show(struct kobject *kobj, 
{

	struct acpi_device *device = to_acpi_device(kobj);

	struct acpi_device_attribute *attribute = to_handle_attr(attr);

	return attribute->show ? attribute->show(device, buf) : 0;

	return attribute->show ? attribute->show(device, buf) : -EIO;

}

static ssize_t acpi_device_attr_store(struct kobject *kobj,

		struct attribute *attr, const char *buf, size_t len)

{

	struct acpi_device *device = to_acpi_device(kobj);

	struct acpi_device_attribute *attribute = to_handle_attr(attr);

	return attribute->store ? attribute->store(device, buf, len) : len;

	return attribute->store ? attribute->store(device, buf, len) : -EIO;

}



static struct sysfs_ops acpi_device_sysfs_ops = {

drivers/cpufreq/cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static ssize_t show(struct kobject * kobj, struct attribute * attr ,char * buf) 
	policy = cpufreq_cpu_get(policy->cpu);

	if (!policy)

		return -EINVAL;

	ret = fattr->show ? fattr->show(policy,buf) : 0;

	ret = fattr->show ? fattr->show(policy,buf) : -EIO;

	cpufreq_cpu_put(policy);

	return ret;

}
@@ -535,7 +535,7 @@ static ssize_t store(struct kobject * kobj, struct attribute * attr, 
	policy = cpufreq_cpu_get(policy->cpu);

	if (!policy)

		return -EINVAL;

	ret = fattr->store ? fattr->store(policy,buf,count) : 0;

	ret = fattr->store ? fattr->store(policy,buf,count) : -EIO;

	cpufreq_cpu_put(policy);

	return ret;

}

drivers/firmware/edd.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf) 
{

	struct edd_device *dev = to_edd_device(kobj);

	struct edd_attribute *edd_attr = to_edd_attr(attr);

	ssize_t ret = 0;

	ssize_t ret = -EIO;



	if (edd_attr->show)

		ret = edd_attr->show(dev, buf);

drivers/firmware/efivars.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, 
{

	struct efivar_entry *var = to_efivar_entry(kobj);

	struct efivar_attribute *efivar_attr = to_efivar_attr(attr);

	ssize_t ret = 0;

	ssize_t ret = -EIO;



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;
@@ -368,7 +368,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr, 
{

	struct efivar_entry *var = to_efivar_entry(kobj);

	struct efivar_attribute *efivar_attr = to_efivar_attr(attr);

	ssize_t ret = 0;

	ssize_t ret = -EIO;



	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;

drivers/infiniband/core/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static ssize_t port_attr_show(struct kobject *kobj, 
	struct ib_port *p = container_of(kobj, struct ib_port, kobj);



	if (!port_attr->show)

		return 0;

		return -EIO;



	return port_attr->show(p, port_attr, buf);

}