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

Commit af6370ea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ecryptfs: remove version_str file from sysfs 



This file violates the one-value-per-file sysfs rule.

If you all want it added back, please do something like a per-feature
file to show what is present and what isn't.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Mike Halcrow <mhalcrow@us.ibm.com>
Cc: Phillip Hellewell <phillip@hellewell.homeip.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eb41d946

fs/ecryptfs/main.c

+0 −43
Original line number Diff line number Diff line
@@ -744,51 +744,8 @@ static ssize_t version_show(struct kobject *kobj, 


static struct kobj_attribute version_attr = __ATTR_RO(version);



static struct ecryptfs_version_str_map_elem {

	u32 flag;

	char *str;

} ecryptfs_version_str_map[] = {

	{ECRYPTFS_VERSIONING_PASSPHRASE, "passphrase"},

	{ECRYPTFS_VERSIONING_PUBKEY, "pubkey"},

	{ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH, "plaintext passthrough"},

	{ECRYPTFS_VERSIONING_POLICY, "policy"},

	{ECRYPTFS_VERSIONING_XATTR, "metadata in extended attribute"},

	{ECRYPTFS_VERSIONING_MULTKEY, "multiple keys per file"}

};



static ssize_t version_str_show(struct kobject *kobj,

				struct kobj_attribute *attr, char *buff)

{

	int i;

	int remaining = PAGE_SIZE;

	int total_written = 0;



	buff[0] = '\0';

	for (i = 0; i < ARRAY_SIZE(ecryptfs_version_str_map); i++) {

		int entry_size;



		if (!(ECRYPTFS_VERSIONING_MASK

		      & ecryptfs_version_str_map[i].flag))

			continue;

		entry_size = strlen(ecryptfs_version_str_map[i].str);

		if ((entry_size + 2) > remaining)

			goto out;

		memcpy(buff, ecryptfs_version_str_map[i].str, entry_size);

		buff[entry_size++] = '\n';

		buff[entry_size] = '\0';

		buff += entry_size;

		total_written += entry_size;

		remaining -= entry_size;

	}

out:

	return total_written;

}



static struct kobj_attribute version_attr_str = __ATTR_RO(version_str);



static struct attribute *attributes[] = {

	&version_attr.attr,

	&version_attr_str.attr,

	NULL,

};