Commit 1b1d8657 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Jiri Kosina
Browse files

HID: roccat: pyro: 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.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent cdc6829c

drivers/hid/hid-roccat-pyra.c

+25 −25
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ static ssize_t pyra_sysfs_write(struct file *fp, struct kobject *kobj, 


#define PYRA_SYSFS_W(thingy, THINGY) \

static ssize_t pyra_sysfs_write_ ## thingy(struct file *fp, \

		struct kobject *kobj, struct bin_attribute *attr, char *buf, \

		loff_t off, size_t count) \

		struct kobject *kobj, const struct bin_attribute *attr, \

		char *buf, loff_t off, size_t count) \

{ \

	return pyra_sysfs_write(fp, kobj, buf, off, count, \

			PYRA_SIZE_ ## THINGY, PYRA_COMMAND_ ## THINGY); \
@@ -138,8 +138,8 @@ static ssize_t pyra_sysfs_write_ ## thingy(struct file *fp, \ 


#define PYRA_SYSFS_R(thingy, THINGY) \

static ssize_t pyra_sysfs_read_ ## thingy(struct file *fp, \

		struct kobject *kobj, struct bin_attribute *attr, char *buf, \

		loff_t off, size_t count) \

		struct kobject *kobj, const struct bin_attribute *attr, \

		char *buf, loff_t off, size_t count) \

{ \

	return pyra_sysfs_read(fp, kobj, buf, off, count, \

			PYRA_SIZE_ ## THINGY, PYRA_COMMAND_ ## THINGY); \
@@ -151,27 +151,27 @@ PYRA_SYSFS_R(thingy, THINGY) 


#define PYRA_BIN_ATTRIBUTE_RW(thingy, THINGY) \

PYRA_SYSFS_RW(thingy, THINGY); \

static struct bin_attribute bin_attr_##thingy = { \

static const struct bin_attribute bin_attr_##thingy = { \

	.attr = { .name = #thingy, .mode = 0660 }, \

	.size = PYRA_SIZE_ ## THINGY, \

	.read = pyra_sysfs_read_ ## thingy, \

	.write = pyra_sysfs_write_ ## thingy \

	.read_new = pyra_sysfs_read_ ## thingy, \

	.write_new = pyra_sysfs_write_ ## thingy \

}



#define PYRA_BIN_ATTRIBUTE_R(thingy, THINGY) \

PYRA_SYSFS_R(thingy, THINGY); \

static struct bin_attribute bin_attr_##thingy = { \

static const struct bin_attribute bin_attr_##thingy = { \

	.attr = { .name = #thingy, .mode = 0440 }, \

	.size = PYRA_SIZE_ ## THINGY, \

	.read = pyra_sysfs_read_ ## thingy, \

	.size_new = PYRA_SIZE_ ## THINGY, \

	.read_new = pyra_sysfs_read_ ## thingy, \

}



#define PYRA_BIN_ATTRIBUTE_W(thingy, THINGY) \

PYRA_SYSFS_W(thingy, THINGY); \

static struct bin_attribute bin_attr_##thingy = { \

static const struct bin_attribute bin_attr_##thingy = { \

	.attr = { .name = #thingy, .mode = 0220 }, \

	.size = PYRA_SIZE_ ## THINGY, \

	.write = pyra_sysfs_write_ ## thingy \

	.write_new = pyra_sysfs_write_ ## thingy \

}



PYRA_BIN_ATTRIBUTE_W(control, CONTROL);
@@ -180,8 +180,8 @@ PYRA_BIN_ATTRIBUTE_RW(profile_settings, PROFILE_SETTINGS); 
PYRA_BIN_ATTRIBUTE_RW(profile_buttons, PROFILE_BUTTONS);



static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp,

		struct kobject *kobj, struct bin_attribute *attr, char *buf,

		loff_t off, size_t count)

		struct kobject *kobj, const struct bin_attribute *attr,

		char *buf, loff_t off, size_t count)

{

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));
@@ -198,8 +198,8 @@ static ssize_t pyra_sysfs_read_profilex_settings(struct file *fp, 
}



static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp,

		struct kobject *kobj, struct bin_attribute *attr, char *buf,

		loff_t off, size_t count)

		struct kobject *kobj, const struct bin_attribute *attr,

		char *buf, loff_t off, size_t count)

{

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct usb_device *usb_dev = interface_to_usbdev(to_usb_interface(dev));
@@ -216,16 +216,16 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struct file *fp, 
}



#define PROFILE_ATTR(number)						\

static struct bin_attribute bin_attr_profile##number##_settings = {	\

static const struct bin_attribute bin_attr_profile##number##_settings = {	\

	.attr = { .name = "profile" #number "_settings", .mode = 0440 },	\

	.size = PYRA_SIZE_PROFILE_SETTINGS,				\

	.read = pyra_sysfs_read_profilex_settings,			\

	.read_new = pyra_sysfs_read_profilex_settings,			\

	.private = &profile_numbers[number-1],				\

};									\

static struct bin_attribute bin_attr_profile##number##_buttons = {	\

static const struct bin_attribute bin_attr_profile##number##_buttons = {	\

	.attr = { .name = "profile" #number "_buttons", .mode = 0440 },	\

	.size = PYRA_SIZE_PROFILE_BUTTONS,				\

	.read = pyra_sysfs_read_profilex_buttons,			\

	.read_new = pyra_sysfs_read_profilex_buttons,			\

	.private = &profile_numbers[number-1],				\

};

PROFILE_ATTR(1);
@@ -235,8 +235,8 @@ PROFILE_ATTR(4); 
PROFILE_ATTR(5);



static ssize_t pyra_sysfs_write_settings(struct file *fp,

		struct kobject *kobj, struct bin_attribute *attr, char *buf,

		loff_t off, size_t count)

		struct kobject *kobj, const struct bin_attribute *attr,

		char *buf, loff_t off, size_t count)

{

	struct device *dev = kobj_to_dev(kobj)->parent->parent;

	struct pyra_device *pyra = hid_get_drvdata(dev_get_drvdata(dev));
@@ -273,7 +273,7 @@ static ssize_t pyra_sysfs_write_settings(struct file *fp, 
}



PYRA_SYSFS_R(settings, SETTINGS);

static struct bin_attribute bin_attr_settings =

static const struct bin_attribute bin_attr_settings =

	__BIN_ATTR(settings, (S_IWUSR | S_IRUGO),

		   pyra_sysfs_read_settings, pyra_sysfs_write_settings,

		   PYRA_SIZE_SETTINGS);
@@ -334,7 +334,7 @@ static struct attribute *pyra_attrs[] = { 
	NULL,

};



static struct bin_attribute *pyra_bin_attributes[] = {

static const struct bin_attribute *const pyra_bin_attributes[] = {

	&bin_attr_control,

	&bin_attr_info,

	&bin_attr_profile_settings,
@@ -355,7 +355,7 @@ static struct bin_attribute *pyra_bin_attributes[] = { 


static const struct attribute_group pyra_group = {

	.attrs = pyra_attrs,

	.bin_attrs = pyra_bin_attributes,

	.bin_attrs_new = pyra_bin_attributes,

};



static const struct attribute_group *pyra_groups[] = {