Skip to content

Commit b481f64

Browse files
dinghaoliumartinkpetersen
authored andcommitted
scsi: zfcp: Fix a double put in zfcp_port_enqueue()
When device_register() fails, zfcp_port_release() will be called after put_device(). As a result, zfcp_ccw_adapter_put() will be called twice: one in zfcp_port_release() and one in the error path after device_register(). So the reference on the adapter object is doubly put, which may lead to a premature free. Fix this by adjusting the error tag after device_register(). Fixes: f3450c7 ("[SCSI] zfcp: Replace local reference counting with common kref") Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> Link: https://lore.kernel.org/r/20230923103723.10320-1-dinghao.liu@zju.edu.cn Acked-by: Benjamin Block <bblock@linux.ibm.com> Cc: stable@vger.kernel.org # v2.6.33+ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 514f0c4 commit b481f64

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/s390/scsi/zfcp_aux.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,12 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
518518
if (port) {
519519
put_device(&port->dev);
520520
retval = -EEXIST;
521-
goto err_out;
521+
goto err_put;
522522
}
523523

524524
port = kzalloc(sizeof(struct zfcp_port), GFP_KERNEL);
525525
if (!port)
526-
goto err_out;
526+
goto err_put;
527527

528528
rwlock_init(&port->unit_list_lock);
529529
INIT_LIST_HEAD(&port->unit_list);
@@ -546,7 +546,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
546546

547547
if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) {
548548
kfree(port);
549-
goto err_out;
549+
goto err_put;
550550
}
551551
retval = -EINVAL;
552552

@@ -563,7 +563,8 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
563563

564564
return port;
565565

566-
err_out:
566+
err_put:
567567
zfcp_ccw_adapter_put(adapter);
568+
err_out:
568569
return ERR_PTR(retval);
569570
}

0 commit comments

Comments
 (0)