Commit 664f0549 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Greg Kroah-Hartman
Browse files

nvmem: core: use is_bin_visible for permissions 



By using is_bin_visible callback to set permissions will remove a
large list of attribute groups. These group permissions can be
dynamically derived in the callback.

Also add checks for read/write callbacks and set permissions accordingly.

Suggested-by: default avatarGreg KH <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200325131951.31887-2-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f60442dd

drivers/nvmem/core.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) 
	nvmem->read_only = device_property_present(config->dev, "read-only") ||

			   config->read_only || !nvmem->reg_write;



	nvmem->dev.groups = nvmem_sysfs_get_groups(nvmem, config);

	nvmem->dev.groups = nvmem_sysfs_get_groups();



	dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);

drivers/nvmem/nvmem-sysfs.c

+30 −59
Original line number Diff line number Diff line
@@ -104,6 +104,28 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj, 
	return count;

}



static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,

					 struct bin_attribute *attr, int i)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct nvmem_device *nvmem = to_nvmem_device(dev);

	umode_t mode = 0400;



	if (!nvmem->root_only)

		mode |= 0044;



	if (!nvmem->read_only)

		mode |= 0200;



	if (!nvmem->reg_write)

		mode &= ~0200;



	if (!nvmem->reg_read)

		mode &= ~0444;



	return mode;

}



/* default read/write permissions */

static struct bin_attribute bin_attr_rw_nvmem = {

	.attr	= {
@@ -114,18 +136,19 @@ static struct bin_attribute bin_attr_rw_nvmem = { 
	.write	= bin_attr_nvmem_write,

};



static struct bin_attribute *nvmem_bin_rw_attributes[] = {

static struct bin_attribute *nvmem_bin_attributes[] = {

	&bin_attr_rw_nvmem,

	NULL,

};



static const struct attribute_group nvmem_bin_rw_group = {

	.bin_attrs	= nvmem_bin_rw_attributes,

static const struct attribute_group nvmem_bin_group = {

	.bin_attrs	= nvmem_bin_attributes,

	.attrs		= nvmem_attrs,

	.is_bin_visible = nvmem_bin_attr_is_visible,

};



static const struct attribute_group *nvmem_rw_dev_groups[] = {

	&nvmem_bin_rw_group,

static const struct attribute_group *nvmem_dev_groups[] = {

	&nvmem_bin_group,

	NULL,

};
@@ -138,21 +161,6 @@ static struct bin_attribute bin_attr_ro_nvmem = { 
	.read	= bin_attr_nvmem_read,

};



static struct bin_attribute *nvmem_bin_ro_attributes[] = {

	&bin_attr_ro_nvmem,

	NULL,

};



static const struct attribute_group nvmem_bin_ro_group = {

	.bin_attrs	= nvmem_bin_ro_attributes,

	.attrs		= nvmem_attrs,

};



static const struct attribute_group *nvmem_ro_dev_groups[] = {

	&nvmem_bin_ro_group,

	NULL,

};



/* default read/write permissions, root only */

static struct bin_attribute bin_attr_rw_root_nvmem = {

	.attr	= {
@@ -163,21 +171,6 @@ static struct bin_attribute bin_attr_rw_root_nvmem = { 
	.write	= bin_attr_nvmem_write,

};



static struct bin_attribute *nvmem_bin_rw_root_attributes[] = {

	&bin_attr_rw_root_nvmem,

	NULL,

};



static const struct attribute_group nvmem_bin_rw_root_group = {

	.bin_attrs	= nvmem_bin_rw_root_attributes,

	.attrs		= nvmem_attrs,

};



static const struct attribute_group *nvmem_rw_root_dev_groups[] = {

	&nvmem_bin_rw_root_group,

	NULL,

};



/* read only permission, root only */

static struct bin_attribute bin_attr_ro_root_nvmem = {

	.attr	= {
@@ -187,31 +180,9 @@ static struct bin_attribute bin_attr_ro_root_nvmem = { 
	.read	= bin_attr_nvmem_read,

};



static struct bin_attribute *nvmem_bin_ro_root_attributes[] = {

	&bin_attr_ro_root_nvmem,

	NULL,

};



static const struct attribute_group nvmem_bin_ro_root_group = {

	.bin_attrs	= nvmem_bin_ro_root_attributes,

	.attrs		= nvmem_attrs,

};



static const struct attribute_group *nvmem_ro_root_dev_groups[] = {

	&nvmem_bin_ro_root_group,

	NULL,

};



const struct attribute_group **nvmem_sysfs_get_groups(

					struct nvmem_device *nvmem,

					const struct nvmem_config *config)

const struct attribute_group **nvmem_sysfs_get_groups(void)

{

	if (config->root_only)

		return nvmem->read_only ?

			nvmem_ro_root_dev_groups :

			nvmem_rw_root_dev_groups;



	return nvmem->read_only ? nvmem_ro_dev_groups : nvmem_rw_dev_groups;

	return nvmem_dev_groups;

}



/*

drivers/nvmem/nvmem.h

+2 −6
Original line number Diff line number Diff line
@@ -36,17 +36,13 @@ struct nvmem_device { 
#define FLAG_COMPAT		BIT(0)



#ifdef CONFIG_NVMEM_SYSFS

const struct attribute_group **nvmem_sysfs_get_groups(

					struct nvmem_device *nvmem,

					const struct nvmem_config *config);

const struct attribute_group **nvmem_sysfs_get_groups(void);

int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,

			      const struct nvmem_config *config);

void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,

			      const struct nvmem_config *config);

#else

static inline const struct attribute_group **nvmem_sysfs_get_groups(

					struct nvmem_device *nvmem,

					const struct nvmem_config *config)

static inline const struct attribute_group **nvmem_sysfs_get_groups(void)

{

	return NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE