From: Julia Lawall <julia@xxxxxxx> The initializations of both fcoe_nport_scsi_transport and fcoe_vport_scsi_transport can fail, so test both of them. Convert the return value to -ENOMEM to better reflect the reason for the error. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ identifier x,y,f!={PTR_ERR,ERR_PTR,ERR_CAST}; statement S; @@ x = f(...); ( if (\(x == NULL\|IS_ERR(x)\)) S | *if (\(y == NULL\|IS_ERR(y)\)) { ... when != x return ...; } ) // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> --- drivers/scsi/fcoe/fcoe.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index ba710e3..2a279eb 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -1093,12 +1093,21 @@ static int __init fcoe_if_init(void) /* attach to scsi transport */ fcoe_nport_scsi_transport = fc_attach_transport(&fcoe_nport_fc_functions); + + if (!fcoe_nport_scsi_transport) { + printk(KERN_ERR + "fcoe_nport: Failed to attach to the FC transport\n"); + return -ENOMEM; + } + fcoe_vport_scsi_transport = fc_attach_transport(&fcoe_vport_fc_functions); - if (!fcoe_nport_scsi_transport) { - printk(KERN_ERR "fcoe: Failed to attach to the FC transport\n"); - return -ENODEV; + if (!fcoe_vport_scsi_transport) { + printk(KERN_ERR + "fcoe_vport: Failed to attach to the FC transport\n"); + fc_release_transport(fcoe_nport_scsi_transport); + return -ENOMEM; } return 0; -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
