linux-kernel - [PATCH 4/4] firmware: google: vpd: Use const 'struct bin

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20241215-sysfs-const-bin_attr-google-v1-4-e5c2808f5833@weissschuh.net>
Date: Sun, 15 Dec 2024 15:49:12 +0100
From: Thomas Weißschuh <linux@...ssschuh.net>
To: Tzung-Bi Shih <tzungbi@...nel.org>, 
 Brian Norris <briannorris@...omium.org>, 
 Julius Werner <jwerner@...omium.org>
Cc: chrome-platform@...ts.linux.dev, linux-kernel@...r.kernel.org, 
 Thomas Weißschuh <linux@...ssschuh.net>
Subject: [PATCH 4/4] firmware: google: vpd: Use const 'struct
 bin_attribute' callback

The sysfs core now provides callback variants that explicitly take a
const pointer. Use them so the non-const variants can be removed.

Signed-off-by: Thomas Weißschuh <linux@...ssschuh.net>

---
The custom read functions could also just be replaced by
sysfs_bin_attr_simple_read(). See below.
That would slightly conflict with another series of mine [0],
bute the resolution would be trivial.

[0] https://lore.kernel.org/lkml/20241205-sysfs-const-bin_attr-simple-v1-0-4a4e4ced71e3@weissschuh.net/

	diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
	index 254ac6545d68..1ce9a7af635e 100644
	--- a/drivers/firmware/google/vpd.c
	+++ b/drivers/firmware/google/vpd.c
	@@ -121,8 +111,8 @@ static int vpd_section_attrib_add(const u8 *key, u32 key_len,
		info->bin_attr.attr.name = info->key;
		info->bin_attr.attr.mode = 0444;
		info->bin_attr.size = value_len;
	-	info->bin_attr.read_new = vpd_attrib_read;
	-	info->bin_attr.private = info;
	+	info->bin_attr.read = sysfs_bin_attr_simple_read;
	+	info->bin_attr.private = (void *)info->value;

		info->value = value;

	 static int vpd_section_create_attribs(struct vpd_section *sec)
	 {
		s32 consumed;
	@@ -201,8 +181,8 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
		sec->bin_attr.attr.name = sec->raw_name;
		sec->bin_attr.attr.mode = 0444;
		sec->bin_attr.size = size;
	-	sec->bin_attr.read_new = vpd_section_read;
	-	sec->bin_attr.private = sec;
	+	sec->bin_attr.read = sysfs_bin_attr_simple_read;
	+	sec->bin_attr.private = sec->baseaddr;

		err = sysfs_create_bin_file(vpd_kobj, &sec->bin_attr);
		if (err)
---
 drivers/firmware/google/vpd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 1749529f63d449dd88e90e12ac6e50ad8f15450d..254ac6545d680ac099ae2efa3c2109c9eb8c41be 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -56,7 +56,7 @@ static struct vpd_section ro_vpd;
 static struct vpd_section rw_vpd;
 
 static ssize_t vpd_attrib_read(struct file *filp, struct kobject *kobp,
-			       struct bin_attribute *bin_attr, char *buf,
+			       const struct bin_attribute *bin_attr, char *buf,
 			       loff_t pos, size_t count)
 {
 	struct vpd_attrib_info *info = bin_attr->private;
@@ -121,7 +121,7 @@ static int vpd_section_attrib_add(const u8 *key, u32 key_len,
 	info->bin_attr.attr.name = info->key;
 	info->bin_attr.attr.mode = 0444;
 	info->bin_attr.size = value_len;
-	info->bin_attr.read = vpd_attrib_read;
+	info->bin_attr.read_new = vpd_attrib_read;
 	info->bin_attr.private = info;
 
 	info->value = value;
@@ -156,7 +156,7 @@ static void vpd_section_attrib_destroy(struct vpd_section *sec)
 }
 
 static ssize_t vpd_section_read(struct file *filp, struct kobject *kobp,
-				struct bin_attribute *bin_attr, char *buf,
+				const struct bin_attribute *bin_attr, char *buf,
 				loff_t pos, size_t count)
 {
 	struct vpd_section *sec = bin_attr->private;
@@ -201,7 +201,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
 	sec->bin_attr.attr.name = sec->raw_name;
 	sec->bin_attr.attr.mode = 0444;
 	sec->bin_attr.size = size;
-	sec->bin_attr.read = vpd_section_read;
+	sec->bin_attr.read_new = vpd_section_read;
 	sec->bin_attr.private = sec;
 
 	err = sysfs_create_bin_file(vpd_kobj, &sec->bin_attr);

-- 
2.47.1