redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ecryptfs: fix error handling

Browse source 
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: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michael Halcrow 2007-10-16 01:28:07 -07:00 committed by Linus Torvalds
parent 5dda6992a3
commit cf81f89d9a
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
fs/ecryptfs/main.c
View file

@ -799,13 +799,6 @@ out:
static void do_sysfs_unregistration(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_remove_file(&ecryptfs_subsys.kobj,
&sysfs_attr_version.attr); &sysfs_attr_version.attr);
sysfs_remove_file(&ecryptfs_subsys.kobj, sysfs_remove_file(&ecryptfs_subsys.kobj,
@ -836,43 +829,49 @@ static int __init ecryptfs_init(void)
rc = register_filesystem(&ecryptfs_fs_type); rc = register_filesystem(&ecryptfs_fs_type);
if (rc) { if (rc) {
printk(KERN_ERR "Failed to register filesystem\n"); printk(KERN_ERR "Failed to register filesystem\n");
ecryptfs_free_kmem_caches(); goto out_free_kmem_caches;
goto out;
} }
kobj_set_kset_s(&ecryptfs_subsys, fs_subsys); kobj_set_kset_s(&ecryptfs_subsys, fs_subsys);
rc = do_sysfs_registration(); rc = do_sysfs_registration();
if (rc) { if (rc) {
printk(KERN_ERR "sysfs registration failed\n"); printk(KERN_ERR "sysfs registration failed\n");
unregister_filesystem(&ecryptfs_fs_type); goto out_unregister_filesystem;
ecryptfs_free_kmem_caches();
goto out;
} }
rc = ecryptfs_init_messaging(ecryptfs_transport); rc = ecryptfs_init_messaging(ecryptfs_transport);
if (rc) { if (rc) {
ecryptfs_printk(KERN_ERR, "Failure occured while attempting to " ecryptfs_printk(KERN_ERR, "Failure occured while attempting to "
"initialize the eCryptfs netlink socket\n"); "initialize the eCryptfs netlink socket\n");
do_sysfs_unregistration(); goto out_do_sysfs_unregistration;
unregister_filesystem(&ecryptfs_fs_type);
ecryptfs_free_kmem_caches();
goto out;
} }
rc = ecryptfs_init_crypto(); rc = ecryptfs_init_crypto();
if (rc) { if (rc) {
printk(KERN_ERR "Failure whilst attempting to init crypto; " printk(KERN_ERR "Failure whilst attempting to init crypto; "
"rc = [%d]\n", rc); "rc = [%d]\n", rc);
do_sysfs_unregistration(); goto out_release_messaging;
unregister_filesystem(&ecryptfs_fs_type);
ecryptfs_free_kmem_caches();
goto out;
} }
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();
out: out:
return rc; return rc;
} }
static void __exit ecryptfs_exit(void) 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); ecryptfs_release_messaging(ecryptfs_transport);
do_sysfs_unregistration();
unregister_filesystem(&ecryptfs_fs_type); unregister_filesystem(&ecryptfs_fs_type);
ecryptfs_free_kmem_caches(); ecryptfs_free_kmem_caches();
} }