| From 48de68a40aef032a2e198437f4781a83bfb938db Mon Sep 17 00:00:00 2001 |
| From: Mike Christie <michaelc@cs.wisc.edu> |
| Date: Tue, 17 Nov 2009 21:25:16 -0600 |
| Subject: SCSI: fc class: fix fc_transport_init error handling |
| |
| From: Mike Christie <michaelc@cs.wisc.edu> |
| |
| commit 48de68a40aef032a2e198437f4781a83bfb938db upstream. |
| |
| 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> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/scsi_transport_fc.c | 17 ++++++++++++++--- |
| 1 file changed, 14 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/scsi/scsi_transport_fc.c |
| +++ b/drivers/scsi/scsi_transport_fc.c |
| @@ -648,11 +648,22 @@ static __init int fc_transport_init(void |
| return error; |
| error = transport_class_register(&fc_vport_class); |
| if (error) |
| - return error; |
| + goto unreg_host_class; |
| error = transport_class_register(&fc_rport_class); |
| if (error) |
| - return error; |
| - return transport_class_register(&fc_transport_class); |
| + goto unreg_vport_class; |
| + error = transport_class_register(&fc_transport_class); |
| + if (error) |
| + goto unreg_rport_class; |
| + return 0; |
| + |
| +unreg_rport_class: |
| + transport_class_unregister(&fc_rport_class); |
| +unreg_vport_class: |
| + transport_class_unregister(&fc_vport_class); |
| +unreg_host_class: |
| + transport_class_unregister(&fc_host_class); |
| + return error; |
| } |
| |
| static void __exit fc_transport_exit(void) |
