Unverified Commit dc55753c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11925 nilfs2: protect references to superblock parameters exposed in sysfs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Wenhui <zhaowenhui8@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WYXR5ZKTSMZMX5HMZ5SOWZU5TW6EPRXC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARYCR 
 
Link:https://gitee.com/openeuler/kernel/pulls/11925

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 25fe4e0d 4019a02b

fs/nilfs2/sysfs.c

+33 −10
Original line number Diff line number Diff line
@@ -843,9 +843,15 @@ ssize_t nilfs_dev_revision_show(struct nilfs_dev_attr *attr, 
				struct the_nilfs *nilfs,

				char *buf)

{

	struct nilfs_super_block **sbp = nilfs->ns_sbp;

	u32 major = le32_to_cpu(sbp[0]->s_rev_level);

	u16 minor = le16_to_cpu(sbp[0]->s_minor_rev_level);

	struct nilfs_super_block *raw_sb;

	u32 major;

	u16 minor;



	down_read(&nilfs->ns_sem);

	raw_sb = nilfs->ns_sbp[0];

	major = le32_to_cpu(raw_sb->s_rev_level);

	minor = le16_to_cpu(raw_sb->s_minor_rev_level);

	up_read(&nilfs->ns_sem);



	return snprintf(buf, PAGE_SIZE, "%d.%d\n", major, minor);

}
@@ -863,8 +869,13 @@ ssize_t nilfs_dev_device_size_show(struct nilfs_dev_attr *attr, 
				    struct the_nilfs *nilfs,

				    char *buf)

{

	struct nilfs_super_block **sbp = nilfs->ns_sbp;

	u64 dev_size = le64_to_cpu(sbp[0]->s_dev_size);

	struct nilfs_super_block *raw_sb;

	u64 dev_size;



	down_read(&nilfs->ns_sem);

	raw_sb = nilfs->ns_sbp[0];

	dev_size = le64_to_cpu(raw_sb->s_dev_size);

	up_read(&nilfs->ns_sem);



	return snprintf(buf, PAGE_SIZE, "%llu\n", dev_size);

}
@@ -886,9 +897,15 @@ ssize_t nilfs_dev_uuid_show(struct nilfs_dev_attr *attr, 
			    struct the_nilfs *nilfs,

			    char *buf)

{

	struct nilfs_super_block **sbp = nilfs->ns_sbp;

	struct nilfs_super_block *raw_sb;

	ssize_t len;



	return snprintf(buf, PAGE_SIZE, "%pUb\n", sbp[0]->s_uuid);

	down_read(&nilfs->ns_sem);

	raw_sb = nilfs->ns_sbp[0];

	len = snprintf(buf, PAGE_SIZE, "%pUb\n", raw_sb->s_uuid);

	up_read(&nilfs->ns_sem);



	return len;

}



static
@@ -896,10 +913,16 @@ ssize_t nilfs_dev_volume_name_show(struct nilfs_dev_attr *attr, 
				    struct the_nilfs *nilfs,

				    char *buf)

{

	struct nilfs_super_block **sbp = nilfs->ns_sbp;

	struct nilfs_super_block *raw_sb;

	ssize_t len;



	down_read(&nilfs->ns_sem);

	raw_sb = nilfs->ns_sbp[0];

	len = scnprintf(buf, sizeof(raw_sb->s_volume_name), "%s\n",

			raw_sb->s_volume_name);

	up_read(&nilfs->ns_sem);



	return scnprintf(buf, sizeof(sbp[0]->s_volume_name), "%s\n",

			 sbp[0]->s_volume_name);

	return len;

}



static const char dev_readme_str[] =