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

s390/pkey: 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>
Tested-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Reviewed-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Link: https://lore.kernel.org/r/20241211-sysfs-const-bin_attr-s390-v1-5-be01f66bfcf7@weissschuh.net


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

drivers/s390/crypto/pkey_sysfs.c

+64 −64
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static ssize_t pkey_protkey_hmac_attr_read(u32 keytype, char *buf, 


static ssize_t protkey_aes_128_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -194,7 +194,7 @@ static ssize_t protkey_aes_128_read(struct file *filp, 


static ssize_t protkey_aes_192_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -204,7 +204,7 @@ static ssize_t protkey_aes_192_read(struct file *filp, 


static ssize_t protkey_aes_256_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -214,7 +214,7 @@ static ssize_t protkey_aes_256_read(struct file *filp, 


static ssize_t protkey_aes_128_xts_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -224,7 +224,7 @@ static ssize_t protkey_aes_128_xts_read(struct file *filp, 


static ssize_t protkey_aes_256_xts_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -234,7 +234,7 @@ static ssize_t protkey_aes_256_xts_read(struct file *filp, 


static ssize_t protkey_aes_xts_128_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -244,7 +244,7 @@ static ssize_t protkey_aes_xts_128_read(struct file *filp, 


static ssize_t protkey_aes_xts_256_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -254,7 +254,7 @@ static ssize_t protkey_aes_xts_256_read(struct file *filp, 


static ssize_t protkey_hmac_512_read(struct file *filp,

				     struct kobject *kobj,

				     struct bin_attribute *attr,

				     const struct bin_attribute *attr,

				     char *buf, loff_t off,

				     size_t count)

{
@@ -264,7 +264,7 @@ static ssize_t protkey_hmac_512_read(struct file *filp, 


static ssize_t protkey_hmac_1024_read(struct file *filp,

				      struct kobject *kobj,

				      struct bin_attribute *attr,

				      const struct bin_attribute *attr,

				      char *buf, loff_t off,

				      size_t count)

{
@@ -272,17 +272,17 @@ static ssize_t protkey_hmac_1024_read(struct file *filp, 
					   buf, off, count);

}



static BIN_ATTR_RO(protkey_aes_128, sizeof(struct protaeskeytoken));

static BIN_ATTR_RO(protkey_aes_192, sizeof(struct protaeskeytoken));

static BIN_ATTR_RO(protkey_aes_256, sizeof(struct protaeskeytoken));

static BIN_ATTR_RO(protkey_aes_128_xts, 2 * sizeof(struct protaeskeytoken));

static BIN_ATTR_RO(protkey_aes_256_xts, 2 * sizeof(struct protaeskeytoken));

static BIN_ATTR_RO(protkey_aes_xts_128, sizeof(struct protkeytoken) + 64);

static BIN_ATTR_RO(protkey_aes_xts_256, sizeof(struct protkeytoken) + 96);

static BIN_ATTR_RO(protkey_hmac_512, sizeof(struct protkeytoken) + 96);

static BIN_ATTR_RO(protkey_hmac_1024, sizeof(struct protkeytoken) + 160);

static const BIN_ATTR_RO(protkey_aes_128, sizeof(struct protaeskeytoken));

static const BIN_ATTR_RO(protkey_aes_192, sizeof(struct protaeskeytoken));

static const BIN_ATTR_RO(protkey_aes_256, sizeof(struct protaeskeytoken));

static const BIN_ATTR_RO(protkey_aes_128_xts, 2 * sizeof(struct protaeskeytoken));

static const BIN_ATTR_RO(protkey_aes_256_xts, 2 * sizeof(struct protaeskeytoken));

static const BIN_ATTR_RO(protkey_aes_xts_128, sizeof(struct protkeytoken) + 64);

static const BIN_ATTR_RO(protkey_aes_xts_256, sizeof(struct protkeytoken) + 96);

static const BIN_ATTR_RO(protkey_hmac_512, sizeof(struct protkeytoken) + 96);

static const BIN_ATTR_RO(protkey_hmac_1024, sizeof(struct protkeytoken) + 160);



static struct bin_attribute *protkey_attrs[] = {

static const struct bin_attribute *const protkey_attrs[] = {

	&bin_attr_protkey_aes_128,

	&bin_attr_protkey_aes_192,

	&bin_attr_protkey_aes_256,
@@ -295,9 +295,9 @@ static struct bin_attribute *protkey_attrs[] = { 
	NULL

};



static struct attribute_group protkey_attr_group = {

static const struct attribute_group protkey_attr_group = {

	.name	       = "protkey",

	.bin_attrs = protkey_attrs,

	.bin_attrs_new = protkey_attrs,

};



/*
@@ -341,7 +341,7 @@ static ssize_t pkey_ccadata_aes_attr_read(u32 keytype, bool is_xts, char *buf, 


static ssize_t ccadata_aes_128_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -351,7 +351,7 @@ static ssize_t ccadata_aes_128_read(struct file *filp, 


static ssize_t ccadata_aes_192_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -361,7 +361,7 @@ static ssize_t ccadata_aes_192_read(struct file *filp, 


static ssize_t ccadata_aes_256_read(struct file *filp,

				    struct kobject *kobj,

				    struct bin_attribute *attr,

				    const struct bin_attribute *attr,

				    char *buf, loff_t off,

				    size_t count)

{
@@ -371,7 +371,7 @@ static ssize_t ccadata_aes_256_read(struct file *filp, 


static ssize_t ccadata_aes_128_xts_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -381,7 +381,7 @@ static ssize_t ccadata_aes_128_xts_read(struct file *filp, 


static ssize_t ccadata_aes_256_xts_read(struct file *filp,

					struct kobject *kobj,

					struct bin_attribute *attr,

					const struct bin_attribute *attr,

					char *buf, loff_t off,

					size_t count)

{
@@ -389,13 +389,13 @@ static ssize_t ccadata_aes_256_xts_read(struct file *filp, 
					  off, count);

}



static BIN_ATTR_RO(ccadata_aes_128, sizeof(struct secaeskeytoken));

static BIN_ATTR_RO(ccadata_aes_192, sizeof(struct secaeskeytoken));

static BIN_ATTR_RO(ccadata_aes_256, sizeof(struct secaeskeytoken));

static BIN_ATTR_RO(ccadata_aes_128_xts, 2 * sizeof(struct secaeskeytoken));

static BIN_ATTR_RO(ccadata_aes_256_xts, 2 * sizeof(struct secaeskeytoken));

static const BIN_ATTR_RO(ccadata_aes_128, sizeof(struct secaeskeytoken));

static const BIN_ATTR_RO(ccadata_aes_192, sizeof(struct secaeskeytoken));

static const BIN_ATTR_RO(ccadata_aes_256, sizeof(struct secaeskeytoken));

static const BIN_ATTR_RO(ccadata_aes_128_xts, 2 * sizeof(struct secaeskeytoken));

static const BIN_ATTR_RO(ccadata_aes_256_xts, 2 * sizeof(struct secaeskeytoken));



static struct bin_attribute *ccadata_attrs[] = {

static const struct bin_attribute *const ccadata_attrs[] = {

	&bin_attr_ccadata_aes_128,

	&bin_attr_ccadata_aes_192,

	&bin_attr_ccadata_aes_256,
@@ -404,9 +404,9 @@ static struct bin_attribute *ccadata_attrs[] = { 
	NULL

};



static struct attribute_group ccadata_attr_group = {

static const struct attribute_group ccadata_attr_group = {

	.name	       = "ccadata",

	.bin_attrs = ccadata_attrs,

	.bin_attrs_new = ccadata_attrs,

};



#define CCACIPHERTOKENSIZE	(sizeof(struct cipherkeytoken) + 80)
@@ -455,7 +455,7 @@ static ssize_t pkey_ccacipher_aes_attr_read(enum pkey_key_size keybits, 


static ssize_t ccacipher_aes_128_read(struct file *filp,

				      struct kobject *kobj,

				      struct bin_attribute *attr,

				      const struct bin_attribute *attr,

				      char *buf, loff_t off,

				      size_t count)

{
@@ -465,7 +465,7 @@ static ssize_t ccacipher_aes_128_read(struct file *filp, 


static ssize_t ccacipher_aes_192_read(struct file *filp,

				      struct kobject *kobj,

				      struct bin_attribute *attr,

				      const struct bin_attribute *attr,

				      char *buf, loff_t off,

				      size_t count)

{
@@ -475,7 +475,7 @@ static ssize_t ccacipher_aes_192_read(struct file *filp, 


static ssize_t ccacipher_aes_256_read(struct file *filp,

				      struct kobject *kobj,

				      struct bin_attribute *attr,

				      const struct bin_attribute *attr,

				      char *buf, loff_t off,

				      size_t count)

{
@@ -485,7 +485,7 @@ static ssize_t ccacipher_aes_256_read(struct file *filp, 


static ssize_t ccacipher_aes_128_xts_read(struct file *filp,

					  struct kobject *kobj,

					  struct bin_attribute *attr,

					  const struct bin_attribute *attr,

					  char *buf, loff_t off,

					  size_t count)

{
@@ -495,7 +495,7 @@ static ssize_t ccacipher_aes_128_xts_read(struct file *filp, 


static ssize_t ccacipher_aes_256_xts_read(struct file *filp,

					  struct kobject *kobj,

					  struct bin_attribute *attr,

					  const struct bin_attribute *attr,

					  char *buf, loff_t off,

					  size_t count)

{
@@ -503,13 +503,13 @@ static ssize_t ccacipher_aes_256_xts_read(struct file *filp, 
					    off, count);

}



static BIN_ATTR_RO(ccacipher_aes_128, CCACIPHERTOKENSIZE);

static BIN_ATTR_RO(ccacipher_aes_192, CCACIPHERTOKENSIZE);

static BIN_ATTR_RO(ccacipher_aes_256, CCACIPHERTOKENSIZE);

static BIN_ATTR_RO(ccacipher_aes_128_xts, 2 * CCACIPHERTOKENSIZE);

static BIN_ATTR_RO(ccacipher_aes_256_xts, 2 * CCACIPHERTOKENSIZE);

static const BIN_ATTR_RO(ccacipher_aes_128, CCACIPHERTOKENSIZE);

static const BIN_ATTR_RO(ccacipher_aes_192, CCACIPHERTOKENSIZE);

static const BIN_ATTR_RO(ccacipher_aes_256, CCACIPHERTOKENSIZE);

static const BIN_ATTR_RO(ccacipher_aes_128_xts, 2 * CCACIPHERTOKENSIZE);

static const BIN_ATTR_RO(ccacipher_aes_256_xts, 2 * CCACIPHERTOKENSIZE);



static struct bin_attribute *ccacipher_attrs[] = {

static const struct bin_attribute *const ccacipher_attrs[] = {

	&bin_attr_ccacipher_aes_128,

	&bin_attr_ccacipher_aes_192,

	&bin_attr_ccacipher_aes_256,
@@ -518,9 +518,9 @@ static struct bin_attribute *ccacipher_attrs[] = { 
	NULL

};



static struct attribute_group ccacipher_attr_group = {

static const struct attribute_group ccacipher_attr_group = {

	.name	       = "ccacipher",

	.bin_attrs = ccacipher_attrs,

	.bin_attrs_new = ccacipher_attrs,

};



/*
@@ -570,7 +570,7 @@ static ssize_t pkey_ep11_aes_attr_read(enum pkey_key_size keybits, 


static ssize_t ep11_aes_128_read(struct file *filp,

				 struct kobject *kobj,

				 struct bin_attribute *attr,

				 const struct bin_attribute *attr,

				 char *buf, loff_t off,

				 size_t count)

{
@@ -580,7 +580,7 @@ static ssize_t ep11_aes_128_read(struct file *filp, 


static ssize_t ep11_aes_192_read(struct file *filp,

				 struct kobject *kobj,

				 struct bin_attribute *attr,

				 const struct bin_attribute *attr,

				 char *buf, loff_t off,

				 size_t count)

{
@@ -590,7 +590,7 @@ static ssize_t ep11_aes_192_read(struct file *filp, 


static ssize_t ep11_aes_256_read(struct file *filp,

				 struct kobject *kobj,

				 struct bin_attribute *attr,

				 const struct bin_attribute *attr,

				 char *buf, loff_t off,

				 size_t count)

{
@@ -600,7 +600,7 @@ static ssize_t ep11_aes_256_read(struct file *filp, 


static ssize_t ep11_aes_128_xts_read(struct file *filp,

				     struct kobject *kobj,

				     struct bin_attribute *attr,

				     const struct bin_attribute *attr,

				     char *buf, loff_t off,

				     size_t count)

{
@@ -610,7 +610,7 @@ static ssize_t ep11_aes_128_xts_read(struct file *filp, 


static ssize_t ep11_aes_256_xts_read(struct file *filp,

				     struct kobject *kobj,

				     struct bin_attribute *attr,

				     const struct bin_attribute *attr,

				     char *buf, loff_t off,

				     size_t count)

{
@@ -618,13 +618,13 @@ static ssize_t ep11_aes_256_xts_read(struct file *filp, 
				       off, count);

}



static BIN_ATTR_RO(ep11_aes_128, MAXEP11AESKEYBLOBSIZE);

static BIN_ATTR_RO(ep11_aes_192, MAXEP11AESKEYBLOBSIZE);

static BIN_ATTR_RO(ep11_aes_256, MAXEP11AESKEYBLOBSIZE);

static BIN_ATTR_RO(ep11_aes_128_xts, 2 * MAXEP11AESKEYBLOBSIZE);

static BIN_ATTR_RO(ep11_aes_256_xts, 2 * MAXEP11AESKEYBLOBSIZE);

static const BIN_ATTR_RO(ep11_aes_128, MAXEP11AESKEYBLOBSIZE);

static const BIN_ATTR_RO(ep11_aes_192, MAXEP11AESKEYBLOBSIZE);

static const BIN_ATTR_RO(ep11_aes_256, MAXEP11AESKEYBLOBSIZE);

static const BIN_ATTR_RO(ep11_aes_128_xts, 2 * MAXEP11AESKEYBLOBSIZE);

static const BIN_ATTR_RO(ep11_aes_256_xts, 2 * MAXEP11AESKEYBLOBSIZE);



static struct bin_attribute *ep11_attrs[] = {

static const struct bin_attribute *const ep11_attrs[] = {

	&bin_attr_ep11_aes_128,

	&bin_attr_ep11_aes_192,

	&bin_attr_ep11_aes_256,
@@ -633,9 +633,9 @@ static struct bin_attribute *ep11_attrs[] = { 
	NULL

};



static struct attribute_group ep11_attr_group = {

static const struct attribute_group ep11_attr_group = {

	.name	   = "ep11",

	.bin_attrs = ep11_attrs,

	.bin_attrs_new = ep11_attrs,

};



const struct attribute_group *pkey_attr_groups[] = {