| Message ID | 20190728184255.563332e6@endymion |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] eeprom: at24: make spd world-readable again | expand |
niedz., 28 lip 2019 o 18:43 Jean Delvare <jdelvare@suse.de> napisał(a): > > The compatibility "eeprom" attribute is currently root-only no > matter what the configuration says. The "nvmem" attribute does > respect the setting of the root_only configuration bit, so do the > same for "eeprom". > > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.") > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Bartosz Golaszewski <brgl@bgdev.pl> > Cc: Arnd Bergmann <arnd@arndb.de> > --- > Changes since V1: > * Split into 2 patches, one to the at24 driver and one to the nvmem > core. drivers/nvmem/nvmem-sysfs.c | 15 +++++++++++---- > > 1 file changed, 11 insertions(+), 4 deletions(-) > > --- linux-5.2.orig/drivers/nvmem/nvmem-sysfs.c 2019-07-08 00:41:56.000000000 +0200 > +++ linux-5.2/drivers/nvmem/nvmem-sysfs.c 2019-07-28 18:06:53.105140893 +0200 > @@ -224,10 +224,17 @@ int nvmem_sysfs_setup_compat(struct nvme > if (!config->base_dev) > return -EINVAL; > > - if (nvmem->read_only) > - nvmem->eeprom = bin_attr_ro_root_nvmem; > - else > - nvmem->eeprom = bin_attr_rw_root_nvmem; > + if (nvmem->read_only) { > + if (config->root_only) > + nvmem->eeprom = bin_attr_ro_root_nvmem; > + else > + nvmem->eeprom = bin_attr_ro_nvmem; > + } else { > + if (config->root_only) > + nvmem->eeprom = bin_attr_rw_root_nvmem; > + else > + nvmem->eeprom = bin_attr_rw_nvmem; > + } > nvmem->eeprom.attr.name = "eeprom"; > nvmem->eeprom.size = nvmem->size; > #ifdef CONFIG_DEBUG_LOCK_ALLOC > > > -- > Jean Delvare > SUSE L3 Support Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
--- linux-5.2.orig/drivers/nvmem/nvmem-sysfs.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/nvmem/nvmem-sysfs.c 2019-07-28 18:06:53.105140893 +0200 @@ -224,10 +224,17 @@ int nvmem_sysfs_setup_compat(struct nvme if (!config->base_dev) return -EINVAL; - if (nvmem->read_only) - nvmem->eeprom = bin_attr_ro_root_nvmem; - else - nvmem->eeprom = bin_attr_rw_root_nvmem; + if (nvmem->read_only) { + if (config->root_only) + nvmem->eeprom = bin_attr_ro_root_nvmem; + else + nvmem->eeprom = bin_attr_ro_nvmem; + } else { + if (config->root_only) + nvmem->eeprom = bin_attr_rw_root_nvmem; + else + nvmem->eeprom = bin_attr_rw_nvmem; + } nvmem->eeprom.attr.name = "eeprom"; nvmem->eeprom.size = nvmem->size; #ifdef CONFIG_DEBUG_LOCK_ALLOC
The compatibility "eeprom" attribute is currently root-only no matter what the configuration says. The "nvmem" attribute does respect the setting of the root_only configuration bit, so do the same for "eeprom". Signed-off-by: Jean Delvare <jdelvare@suse.de> Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.") Cc: Andrew Lunn <andrew@lunn.ch> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Arnd Bergmann <arnd@arndb.de> --- Changes since V1: * Split into 2 patches, one to the at24 driver and one to the nvmem core. drivers/nvmem/nvmem-sysfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)