Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf81f89d authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

ecryptfs: fix error handling 



The error paths and the module exit code need work. sysfs
unregistration is not the right place to tear down the crypto
subsystem, and the code to undo subsystem initializations on various
error paths is unnecessarily duplicated. This patch addresses those
issues.

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5dda6992

fs/ecryptfs/main.c

+20 −21
Original line number Diff line number Diff line
@@ -799,13 +799,6 @@ static int do_sysfs_registration(void) 


static void do_sysfs_unregistration(void)

{

	int rc;



	rc = ecryptfs_destroy_crypto();

	if (rc) {

		printk(KERN_ERR "Failure whilst attempting to destroy crypto; "

		       "rc = [%d]\n", rc);

	}

	sysfs_remove_file(&ecryptfs_subsys.kobj,

			  &sysfs_attr_version.attr);

	sysfs_remove_file(&ecryptfs_subsys.kobj,
@@ -836,43 +829,49 @@ static int __init ecryptfs_init(void) 
	rc = register_filesystem(&ecryptfs_fs_type);

	if (rc) {

		printk(KERN_ERR "Failed to register filesystem\n");

		ecryptfs_free_kmem_caches();

		goto out;

		goto out_free_kmem_caches;

	}

	kobj_set_kset_s(&ecryptfs_subsys, fs_subsys);

	rc = do_sysfs_registration();

	if (rc) {

		printk(KERN_ERR "sysfs registration failed\n");

		unregister_filesystem(&ecryptfs_fs_type);

		ecryptfs_free_kmem_caches();

		goto out;

		goto out_unregister_filesystem;

	}

	rc = ecryptfs_init_messaging(ecryptfs_transport);

	if (rc) {

		ecryptfs_printk(KERN_ERR, "Failure occured while attempting to "

				"initialize the eCryptfs netlink socket\n");

		do_sysfs_unregistration();

		unregister_filesystem(&ecryptfs_fs_type);

		ecryptfs_free_kmem_caches();

		goto out;

		goto out_do_sysfs_unregistration;

	}

	rc = ecryptfs_init_crypto();

	if (rc) {

		printk(KERN_ERR "Failure whilst attempting to init crypto; "

		       "rc = [%d]\n", rc);

		goto out_release_messaging;

	}

	goto out;

out_release_messaging:

	ecryptfs_release_messaging(ecryptfs_transport);

out_do_sysfs_unregistration:

	do_sysfs_unregistration();

out_unregister_filesystem:

	unregister_filesystem(&ecryptfs_fs_type);

out_free_kmem_caches:

	ecryptfs_free_kmem_caches();

		goto out;

	}

out:

	return rc;

}



static void __exit ecryptfs_exit(void)

{

	do_sysfs_unregistration();

	int rc;



	rc = ecryptfs_destroy_crypto();

	if (rc)

		printk(KERN_ERR "Failure whilst attempting to destroy crypto; "

		       "rc = [%d]\n", rc);

	ecryptfs_release_messaging(ecryptfs_transport);

	do_sysfs_unregistration();

	unregister_filesystem(&ecryptfs_fs_type);

	ecryptfs_free_kmem_caches();

}