| From e70d8b287301eb6d7c7761c6171c56af62110ea3 Mon Sep 17 00:00:00 2001 |
| From: Jean Delvare <jdelvare@suse.de> |
| Date: Sun, 28 Jul 2019 18:42:55 +0200 |
| Subject: nvmem: Use the same permissions for eeprom as for nvmem |
| |
| From: Jean Delvare <jdelvare@suse.de> |
| |
| commit e70d8b287301eb6d7c7761c6171c56af62110ea3 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: Jean Delvare <jdelvare@suse.de> |
| Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.") |
| Reviewed-by: Bartosz 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@endymion |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/nvmem/core.c | 15 +++++++++++---- |
| 1 file changed, 11 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/nvmem/core.c |
| +++ b/drivers/nvmem/core.c |
| @@ -407,10 +407,17 @@ static int nvmem_setup_compat(struct nvm |
| 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 |
