Commit 2f2ac4a0 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley

[SCSI] libfc: fix oops in point-to-point mode

In point-to-point mode, if the PLOGI to the remote port times
out, it can get deleted by the remote port module.  Since there's
no reference by the local port, lport->ptp_data points to a freed
rport, and when the local port is reset and tries to logout again,
an oops occurs in mutex_lock_nested().

Hold a reference count on the point-to-point rdata.
Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 4dc7ccf7
...@@ -228,9 +228,12 @@ static void fc_lport_ptp_setup(struct fc_lport *lport, ...@@ -228,9 +228,12 @@ static void fc_lport_ptp_setup(struct fc_lport *lport,
u64 remote_wwnn) u64 remote_wwnn)
{ {
mutex_lock(&lport->disc.disc_mutex); mutex_lock(&lport->disc.disc_mutex);
if (lport->ptp_rdata) if (lport->ptp_rdata) {
lport->tt.rport_logoff(lport->ptp_rdata); lport->tt.rport_logoff(lport->ptp_rdata);
kref_put(&lport->ptp_rdata->kref, lport->tt.rport_destroy);
}
lport->ptp_rdata = lport->tt.rport_create(lport, remote_fid); lport->ptp_rdata = lport->tt.rport_create(lport, remote_fid);
kref_get(&lport->ptp_rdata->kref);
lport->ptp_rdata->ids.port_name = remote_wwpn; lport->ptp_rdata->ids.port_name = remote_wwpn;
lport->ptp_rdata->ids.node_name = remote_wwnn; lport->ptp_rdata->ids.node_name = remote_wwnn;
mutex_unlock(&lport->disc.disc_mutex); mutex_unlock(&lport->disc.disc_mutex);
...@@ -947,7 +950,11 @@ static void fc_lport_reset_locked(struct fc_lport *lport) ...@@ -947,7 +950,11 @@ static void fc_lport_reset_locked(struct fc_lport *lport)
if (lport->dns_rdata) if (lport->dns_rdata)
lport->tt.rport_logoff(lport->dns_rdata); lport->tt.rport_logoff(lport->dns_rdata);
lport->ptp_rdata = NULL; if (lport->ptp_rdata) {
lport->tt.rport_logoff(lport->ptp_rdata);
kref_put(&lport->ptp_rdata->kref, lport->tt.rport_destroy);
lport->ptp_rdata = NULL;
}
lport->tt.disc_stop(lport); lport->tt.disc_stop(lport);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment