Commit bf8469fc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-constify-struct-bin_attribute' 

Thomas Weißschuh says:

====================
net: constify 'struct bin_attribute'

The sysfs core now allows instances of 'struct bin_attribute' to be
moved into read-only memory. Make use of that to protect them against
accidental or malicious modifications.
====================

Link: https://patch.msgid.link/20241216-sysfs-const-bin_attr-net-v1-0-ec460b91f274@weissschuh.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d3c9510d ae026eae

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+10 −10
Original line number Diff line number Diff line
@@ -2832,7 +2832,7 @@ netxen_sysfs_validate_crb(struct netxen_adapter *adapter, 


static ssize_t

netxen_sysfs_read_crb(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		const struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -2860,7 +2860,7 @@ netxen_sysfs_read_crb(struct file *filp, struct kobject *kobj, 


static ssize_t

netxen_sysfs_write_crb(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		const struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -2901,7 +2901,7 @@ netxen_sysfs_validate_mem(struct netxen_adapter *adapter, 


static ssize_t

netxen_sysfs_read_mem(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		const struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -2922,7 +2922,7 @@ netxen_sysfs_read_mem(struct file *filp, struct kobject *kobj, 
}



static ssize_t netxen_sysfs_write_mem(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr, char *buf,

		const struct bin_attribute *attr, char *buf,

		loff_t offset, size_t size)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -2946,20 +2946,20 @@ static ssize_t netxen_sysfs_write_mem(struct file *filp, struct kobject *kobj, 
static const struct bin_attribute bin_attr_crb = {

	.attr = { .name = "crb", .mode = 0644 },

	.size = 0,

	.read = netxen_sysfs_read_crb,

	.write = netxen_sysfs_write_crb,

	.read_new = netxen_sysfs_read_crb,

	.write_new = netxen_sysfs_write_crb,

};



static const struct bin_attribute bin_attr_mem = {

	.attr = { .name = "mem", .mode = 0644 },

	.size = 0,

	.read = netxen_sysfs_read_mem,

	.write = netxen_sysfs_write_mem,

	.read_new = netxen_sysfs_read_mem,

	.write_new = netxen_sysfs_write_mem,

};



static ssize_t

netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		const struct bin_attribute *attr,

		char *buf, loff_t offset, size_t size)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -3082,7 +3082,7 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobject *kobj, 
static const struct bin_attribute bin_attr_dimm = {

	.attr = { .name = "dimm", .mode = 0644 },

	.size = sizeof(struct netxen_dimm_cfg),

	.read = netxen_sysfs_read_dimm,

	.read_new = netxen_sysfs_read_dimm,

};

drivers/net/phy/spi_ks8995.c

+4 −4
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int ks8995_reset(struct ks8995_switch *ks) 
}



static ssize_t ks8995_registers_read(struct file *filp, struct kobject *kobj,

	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)

	const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)

{

	struct device *dev;

	struct ks8995_switch *ks8995;
@@ -301,7 +301,7 @@ static ssize_t ks8995_registers_read(struct file *filp, struct kobject *kobj, 
}



static ssize_t ks8995_registers_write(struct file *filp, struct kobject *kobj,

	struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)

	const struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count)

{

	struct device *dev;

	struct ks8995_switch *ks8995;
@@ -401,8 +401,8 @@ static const struct bin_attribute ks8995_registers_attr = { 
		.mode   = 0600,

	},

	.size   = KS8995_REGS_SIZE,

	.read   = ks8995_registers_read,

	.write  = ks8995_registers_write,

	.read_new   = ks8995_registers_read,

	.write_new  = ks8995_registers_write,

};



/* ------------------------------------------------------------------------ */

net/bridge/br_sysfs_br.c

+3 −3
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static const struct attribute_group bridge_group = { 
 * Returns the number of bytes read.

 */

static ssize_t brforward_read(struct file *filp, struct kobject *kobj,

			      struct bin_attribute *bin_attr,

			      const struct bin_attribute *bin_attr,

			      char *buf, loff_t off, size_t count)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -1023,10 +1023,10 @@ static ssize_t brforward_read(struct file *filp, struct kobject *kobj, 
	return n;

}



static struct bin_attribute bridge_forward = {

static const struct bin_attribute bridge_forward = {

	.attr = { .name = SYSFS_BRIDGE_FDB,

		  .mode = 0444, },

	.read = brforward_read,

	.read_new = brforward_read,

};



/*