diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2009-11-17 22:25:16 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-10 09:54:11 -0500 |
| commit | 48de68a40aef032a2e198437f4781a83bfb938db (patch) | |
| tree | f3a1a5159ec2994dfca79b560a1a8a09eb66f7ed /drivers/scsi | |
| parent | d685c262083dcd5fd98b7499b22a377a3225229c (diff) | |
[SCSI] fc class: fix fc_transport_init error handling
If transport_class_register fails we should unregister any
registered classes, or we will leak memory or other
resources.
I did a quick modprobe of scsi_transport_fc to test the
patch.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 6531c91501be..ddfcecd5099f 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
| @@ -649,11 +649,22 @@ static __init int fc_transport_init(void) | |||
| 649 | return error; | 649 | return error; |
| 650 | error = transport_class_register(&fc_vport_class); | 650 | error = transport_class_register(&fc_vport_class); |
| 651 | if (error) | 651 | if (error) |
| 652 | return error; | 652 | goto unreg_host_class; |
| 653 | error = transport_class_register(&fc_rport_class); | 653 | error = transport_class_register(&fc_rport_class); |
| 654 | if (error) | 654 | if (error) |
| 655 | return error; | 655 | goto unreg_vport_class; |
| 656 | return transport_class_register(&fc_transport_class); | 656 | error = transport_class_register(&fc_transport_class); |
| 657 | if (error) | ||
| 658 | goto unreg_rport_class; | ||
| 659 | return 0; | ||
| 660 | |||
| 661 | unreg_rport_class: | ||
| 662 | transport_class_unregister(&fc_rport_class); | ||
| 663 | unreg_vport_class: | ||
| 664 | transport_class_unregister(&fc_vport_class); | ||
| 665 | unreg_host_class: | ||
| 666 | transport_class_unregister(&fc_host_class); | ||
| 667 | return error; | ||
| 657 | } | 668 | } |
| 658 | 669 | ||
| 659 | static void __exit fc_transport_exit(void) | 670 | static void __exit fc_transport_exit(void) |
