Commit 2b70a119 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Alexander Gordeev
Browse files

s390/zcrypt: remove ZCRYPT_MULTIDEVNODES kernel config option 



Remove ZCRYPT_MULTIDEVNODES kernel config option and make
the dependent code always build.

The last years showed, that this option is enabled on all distros
and exploited by some features (for example CEX plugin for kubernetes).
So remove this choice as it was never used to switch off the multiple
devices support for the zcrypt device driver.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent af40322e

drivers/crypto/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -92,17 +92,6 @@ config ZCRYPT_DEBUG 


	  If unsure, say N.



config ZCRYPT_MULTIDEVNODES

	bool "Support for multiple zcrypt device nodes"

	default y

	depends on S390

	depends on ZCRYPT

	help

	  With this option enabled the zcrypt device driver can

	  provide multiple devices nodes in /dev. Each device

	  node can get customized to limit access and narrow

	  down the use of the available crypto hardware.



config PKEY

	tristate "Kernel API for protected key handling"

	depends on S390

drivers/s390/crypto/zcrypt_api.c

+0 −18
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ EXPORT_SYMBOL(zcrypt_msgtype); 
 * Multi device nodes extension functions.

 */



#ifdef CONFIG_ZCRYPT_MULTIDEVNODES



struct zcdn_device;



static struct class *zcrypt_class;
@@ -477,8 +475,6 @@ static void zcdn_destroy_all(void) 
	mutex_unlock(&ap_perms_mutex);

}



#endif



/*

 * zcrypt_read (): Not supported beyond zcrypt 1.3.1.

 *
@@ -510,7 +506,6 @@ static int zcrypt_open(struct inode *inode, struct file *filp) 
{

	struct ap_perms *perms = &ap_perms;



#ifdef CONFIG_ZCRYPT_MULTIDEVNODES

	if (filp->f_inode->i_cdev == &zcrypt_cdev) {

		struct zcdn_device *zcdndev;
@@ -522,7 +517,6 @@ static int zcrypt_open(struct inode *inode, struct file *filp) 
		if (zcdndev)

			perms = &zcdndev->perms;

	}

#endif

	filp->private_data = (void *)perms;



	atomic_inc(&zcrypt_open_count);
@@ -536,7 +530,6 @@ static int zcrypt_open(struct inode *inode, struct file *filp) 
 */

static int zcrypt_release(struct inode *inode, struct file *filp)

{

#ifdef CONFIG_ZCRYPT_MULTIDEVNODES

	if (filp->f_inode->i_cdev == &zcrypt_cdev) {

		struct zcdn_device *zcdndev;
@@ -549,7 +542,6 @@ static int zcrypt_release(struct inode *inode, struct file *filp) 
			put_device(&zcdndev->device);

		}

	}

#endif



	atomic_dec(&zcrypt_open_count);

	return 0;
@@ -2061,8 +2053,6 @@ void zcrypt_debug_exit(void) 
	debug_unregister(zcrypt_dbf_info);

}



#ifdef CONFIG_ZCRYPT_MULTIDEVNODES



static int __init zcdn_init(void)

{

	int rc;
@@ -2120,8 +2110,6 @@ static void zcdn_exit(void) 
	class_destroy(zcrypt_class);

}



#endif



/*

 * zcrypt_api_init(): Module initialization.

 *
@@ -2135,11 +2123,9 @@ int __init zcrypt_api_init(void) 
	if (rc)

		goto out;



#ifdef CONFIG_ZCRYPT_MULTIDEVNODES

	rc = zcdn_init();

	if (rc)

		goto out;

#endif



	/* Register the request sprayer. */

	rc = misc_register(&zcrypt_misc_device);
@@ -2152,9 +2138,7 @@ int __init zcrypt_api_init(void) 
	return 0;



out_misc_register_failed:

#ifdef CONFIG_ZCRYPT_MULTIDEVNODES

	zcdn_exit();

#endif

	zcrypt_debug_exit();

out:

	return rc;
@@ -2167,9 +2151,7 @@ int __init zcrypt_api_init(void) 
 */

void __exit zcrypt_api_exit(void)

{

#ifdef CONFIG_ZCRYPT_MULTIDEVNODES

	zcdn_exit();

#endif

	misc_deregister(&zcrypt_misc_device);

	zcrypt_msgtype6_exit();

	zcrypt_msgtype50_exit();