Commit 96c08711 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

nvmem: Use the same permissions for eeprom as for nvmem

commit e70d8b28 upstream.

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: default avatarJean Delvare <jdelvare@suse.de>
Fixes: b6c217ab ("nvmem: Add backwards compatibility support for older EEPROM drivers.")
Reviewed-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20190728184255.563332e6@endymionSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3622d621
...@@ -415,10 +415,17 @@ static int nvmem_setup_compat(struct nvmem_device *nvmem, ...@@ -415,10 +415,17 @@ static int nvmem_setup_compat(struct nvmem_device *nvmem,
if (!config->base_dev) if (!config->base_dev)
return -EINVAL; return -EINVAL;
if (nvmem->read_only) if (nvmem->read_only) {
nvmem->eeprom = bin_attr_ro_root_nvmem; if (config->root_only)
else nvmem->eeprom = bin_attr_ro_root_nvmem;
nvmem->eeprom = bin_attr_rw_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.attr.name = "eeprom";
nvmem->eeprom.size = nvmem->size; nvmem->eeprom.size = nvmem->size;
#ifdef CONFIG_DEBUG_LOCK_ALLOC #ifdef CONFIG_DEBUG_LOCK_ALLOC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment