Commit 77977da7 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Alexander Gordeev
Browse files

s390/ipl: 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>
Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Link: https://lore.kernel.org/r/20241211-sysfs-const-bin_attr-s390-v1-2-be01f66bfcf7@weissschuh.net


Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 221ce94b

arch/s390/kernel/ipl.c

+71 −71
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ 
#define IPL_ATTR_SCP_DATA_SHOW_FN(_prefix, _ipl_block)				\

static ssize_t sys_##_prefix##_scp_data_show(struct file *filp,			\

					    struct kobject *kobj,		\

					    struct bin_attribute *attr,	\

					    const struct bin_attribute *attr,	\

					    char *buf, loff_t off,		\

					    size_t count)			\

{										\
@@ -297,7 +297,7 @@ static ssize_t sys_##_prefix##_scp_data_show(struct file *filp, \ 
#define IPL_ATTR_SCP_DATA_STORE_FN(_prefix, _ipl_block_hdr, _ipl_block, _ipl_bp_len, _ipl_bp0_len)\

static ssize_t sys_##_prefix##_scp_data_store(struct file *filp,		\

					struct kobject *kobj,			\

					struct bin_attribute *attr,	\

					const struct bin_attribute *attr,	\

					char *buf, loff_t off,			\

					size_t count)				\

{										\
@@ -324,14 +324,14 @@ static ssize_t sys_##_prefix##_scp_data_store(struct file *filp, \ 


#define DEFINE_IPL_ATTR_SCP_DATA_RO(_prefix, _ipl_block, _size)		\

IPL_ATTR_SCP_DATA_SHOW_FN(_prefix, _ipl_block)				\

static struct bin_attribute sys_##_prefix##_scp_data_attr =		\

static const struct bin_attribute sys_##_prefix##_scp_data_attr =	\

	__BIN_ATTR(scp_data, 0444, sys_##_prefix##_scp_data_show,	\

		   NULL, _size)



#define DEFINE_IPL_ATTR_SCP_DATA_RW(_prefix, _ipl_block_hdr, _ipl_block, _ipl_bp_len, _ipl_bp0_len, _size)\

IPL_ATTR_SCP_DATA_SHOW_FN(_prefix, _ipl_block)					\

IPL_ATTR_SCP_DATA_STORE_FN(_prefix, _ipl_block_hdr, _ipl_block, _ipl_bp_len, _ipl_bp0_len)\

static struct bin_attribute sys_##_prefix##_scp_data_attr =			\

static const struct bin_attribute sys_##_prefix##_scp_data_attr =		\

	__BIN_ATTR(scp_data, 0644, sys_##_prefix##_scp_data_show,		\

		   sys_##_prefix##_scp_data_store, _size)
@@ -434,19 +434,19 @@ static struct kobj_attribute sys_ipl_device_attr = 
	__ATTR(device, 0444, sys_ipl_device_show, NULL);



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

				      struct bin_attribute *attr, char *buf,

				      const struct bin_attribute *attr, char *buf,

				      loff_t off, size_t count)

{

	return memory_read_from_buffer(buf, count, &off, &ipl_block,

				       ipl_block.hdr.len);

}

static struct bin_attribute sys_ipl_parameter_attr =

static const struct bin_attribute sys_ipl_parameter_attr =

	__BIN_ATTR(binary_parameter, 0444, sys_ipl_parameter_read, NULL,

		   PAGE_SIZE);



DEFINE_IPL_ATTR_SCP_DATA_RO(ipl_fcp, ipl_block.fcp, PAGE_SIZE);



static struct bin_attribute *ipl_fcp_bin_attrs[] = {

static const struct bin_attribute *const ipl_fcp_bin_attrs[] = {

	&sys_ipl_parameter_attr,

	&sys_ipl_fcp_scp_data_attr,

	NULL,
@@ -454,7 +454,7 @@ static struct bin_attribute *ipl_fcp_bin_attrs[] = { 


DEFINE_IPL_ATTR_SCP_DATA_RO(ipl_nvme, ipl_block.nvme, PAGE_SIZE);



static struct bin_attribute *ipl_nvme_bin_attrs[] = {

static const struct bin_attribute *const ipl_nvme_bin_attrs[] = {

	&sys_ipl_parameter_attr,

	&sys_ipl_nvme_scp_data_attr,

	NULL,
@@ -462,7 +462,7 @@ static struct bin_attribute *ipl_nvme_bin_attrs[] = { 


DEFINE_IPL_ATTR_SCP_DATA_RO(ipl_eckd, ipl_block.eckd, PAGE_SIZE);



static struct bin_attribute *ipl_eckd_bin_attrs[] = {

static const struct bin_attribute *const ipl_eckd_bin_attrs[] = {

	&sys_ipl_parameter_attr,

	&sys_ipl_eckd_scp_data_attr,

	NULL,
@@ -593,9 +593,9 @@ static struct attribute *ipl_fcp_attrs[] = { 
	NULL,

};



static struct attribute_group ipl_fcp_attr_group = {

static const struct attribute_group ipl_fcp_attr_group = {

	.attrs = ipl_fcp_attrs,

	.bin_attrs = ipl_fcp_bin_attrs,

	.bin_attrs_new = ipl_fcp_bin_attrs,

};



static struct attribute *ipl_nvme_attrs[] = {
@@ -607,9 +607,9 @@ static struct attribute *ipl_nvme_attrs[] = { 
	NULL,

};



static struct attribute_group ipl_nvme_attr_group = {

static const struct attribute_group ipl_nvme_attr_group = {

	.attrs = ipl_nvme_attrs,

	.bin_attrs = ipl_nvme_bin_attrs,

	.bin_attrs_new = ipl_nvme_bin_attrs,

};



static struct attribute *ipl_eckd_attrs[] = {
@@ -620,9 +620,9 @@ static struct attribute *ipl_eckd_attrs[] = { 
	NULL,

};



static struct attribute_group ipl_eckd_attr_group = {

static const struct attribute_group ipl_eckd_attr_group = {

	.attrs = ipl_eckd_attrs,

	.bin_attrs = ipl_eckd_bin_attrs,

	.bin_attrs_new = ipl_eckd_bin_attrs,

};



/* CCW ipl device attributes */
@@ -640,11 +640,11 @@ static struct attribute *ipl_ccw_attrs_lpar[] = { 
	NULL,

};



static struct attribute_group ipl_ccw_attr_group_vm = {

static const struct attribute_group ipl_ccw_attr_group_vm = {

	.attrs = ipl_ccw_attrs_vm,

};



static struct attribute_group ipl_ccw_attr_group_lpar = {

static const struct attribute_group ipl_ccw_attr_group_lpar = {

	.attrs = ipl_ccw_attrs_lpar

};
@@ -655,7 +655,7 @@ static struct attribute *ipl_common_attrs[] = { 
	NULL,

};



static struct attribute_group ipl_common_attr_group = {

static const struct attribute_group ipl_common_attr_group = {

	.attrs = ipl_common_attrs,

};
@@ -808,7 +808,7 @@ DEFINE_IPL_ATTR_SCP_DATA_RW(reipl_fcp, reipl_block_fcp->hdr, 
			    IPL_BP_FCP_LEN, IPL_BP0_FCP_LEN,

			    DIAG308_SCPDATA_SIZE);



static struct bin_attribute *reipl_fcp_bin_attrs[] = {

static const struct bin_attribute *const reipl_fcp_bin_attrs[] = {

	&sys_reipl_fcp_scp_data_attr,

	NULL,

};
@@ -917,9 +917,9 @@ static struct attribute *reipl_fcp_attrs[] = { 
	NULL,

};



static struct attribute_group reipl_fcp_attr_group = {

static const struct attribute_group reipl_fcp_attr_group = {

	.attrs = reipl_fcp_attrs,

	.bin_attrs = reipl_fcp_bin_attrs,

	.bin_attrs_new = reipl_fcp_bin_attrs,

};



static struct kobj_attribute sys_reipl_fcp_clear_attr =
@@ -932,7 +932,7 @@ DEFINE_IPL_ATTR_SCP_DATA_RW(reipl_nvme, reipl_block_nvme->hdr, 
			    IPL_BP_NVME_LEN, IPL_BP0_NVME_LEN,

			    DIAG308_SCPDATA_SIZE);



static struct bin_attribute *reipl_nvme_bin_attrs[] = {

static const struct bin_attribute *const reipl_nvme_bin_attrs[] = {

	&sys_reipl_nvme_scp_data_attr,

	NULL,

};
@@ -955,9 +955,9 @@ static struct attribute *reipl_nvme_attrs[] = { 
	NULL,

};



static struct attribute_group reipl_nvme_attr_group = {

static const struct attribute_group reipl_nvme_attr_group = {

	.attrs = reipl_nvme_attrs,

	.bin_attrs = reipl_nvme_bin_attrs

	.bin_attrs_new = reipl_nvme_bin_attrs

};



static ssize_t reipl_nvme_clear_show(struct kobject *kobj,
@@ -1031,7 +1031,7 @@ DEFINE_IPL_ATTR_SCP_DATA_RW(reipl_eckd, reipl_block_eckd->hdr, 
			    IPL_BP_ECKD_LEN, IPL_BP0_ECKD_LEN,

			    DIAG308_SCPDATA_SIZE);



static struct bin_attribute *reipl_eckd_bin_attrs[] = {

static const struct bin_attribute *const reipl_eckd_bin_attrs[] = {

	&sys_reipl_eckd_scp_data_attr,

	NULL,

};
@@ -1048,9 +1048,9 @@ static struct attribute *reipl_eckd_attrs[] = { 
	NULL,

};



static struct attribute_group reipl_eckd_attr_group = {

static const struct attribute_group reipl_eckd_attr_group = {

	.attrs = reipl_eckd_attrs,

	.bin_attrs = reipl_eckd_bin_attrs

	.bin_attrs_new = reipl_eckd_bin_attrs

};



static ssize_t reipl_eckd_clear_show(struct kobject *kobj,
@@ -1587,15 +1587,15 @@ static struct attribute *dump_fcp_attrs[] = { 
	NULL,

};



static struct bin_attribute *dump_fcp_bin_attrs[] = {

static const struct bin_attribute *const dump_fcp_bin_attrs[] = {

	&sys_dump_fcp_scp_data_attr,

	NULL,

};



static struct attribute_group dump_fcp_attr_group = {

static const struct attribute_group dump_fcp_attr_group = {

	.name  = IPL_FCP_STR,

	.attrs = dump_fcp_attrs,

	.bin_attrs = dump_fcp_bin_attrs,

	.bin_attrs_new = dump_fcp_bin_attrs,

};



/* NVME dump device attributes */
@@ -1621,15 +1621,15 @@ static struct attribute *dump_nvme_attrs[] = { 
	NULL,

};



static struct bin_attribute *dump_nvme_bin_attrs[] = {

static const struct bin_attribute *const dump_nvme_bin_attrs[] = {

	&sys_dump_nvme_scp_data_attr,

	NULL,

};



static struct attribute_group dump_nvme_attr_group = {

static const struct attribute_group dump_nvme_attr_group = {

	.name  = IPL_NVME_STR,

	.attrs = dump_nvme_attrs,

	.bin_attrs = dump_nvme_bin_attrs,

	.bin_attrs_new = dump_nvme_bin_attrs,

};



/* ECKD dump device attributes */
@@ -1655,15 +1655,15 @@ static struct attribute *dump_eckd_attrs[] = { 
	NULL,

};



static struct bin_attribute *dump_eckd_bin_attrs[] = {

static const struct bin_attribute *const dump_eckd_bin_attrs[] = {

	&sys_dump_eckd_scp_data_attr,

	NULL,

};



static struct attribute_group dump_eckd_attr_group = {

static const struct attribute_group dump_eckd_attr_group = {

	.name  = IPL_ECKD_STR,

	.attrs = dump_eckd_attrs,

	.bin_attrs = dump_eckd_bin_attrs,

	.bin_attrs_new = dump_eckd_bin_attrs,

};



/* CCW dump device attributes */