lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] libfc: fix: rport_recv_req needs disc_mutex when calling rport_lookup

Browse Source 
The rport_lookup function must be called while holding the disc_mutex.
Otherwise, the rdata could be deleted just after that by another thread.

All callers now check the state after grabbing the rdata rp_mutex.
Even though rport_lookup skips ports in DELETE state, it does that
without holding the rdata rp_mutex, so that the state may change.

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Joe Eykholt
2009-08-25 14:03:15 -07:00
committed by James Bottomley
parent 131203a1ef
commit 25b37b981e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/libfc/fc_rport.c
View File

@@ -932,14 +932,17 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
fh = fc_frame_header_get(fp); fh = fc_frame_header_get(fp);
s_id = ntoh24(fh->fh_s_id); s_id = ntoh24(fh->fh_s_id);
mutex_lock(&lport->disc.disc_mutex);
rdata = lport->tt.rport_lookup(lport, s_id); rdata = lport->tt.rport_lookup(lport, s_id);
if (!rdata) { if (!rdata) {
mutex_unlock(&lport->disc.disc_mutex);
els_data.reason = ELS_RJT_UNAB; els_data.reason = ELS_RJT_UNAB;
lport->tt.seq_els_rsp_send(sp, ELS_LS_RJT, &els_data); lport->tt.seq_els_rsp_send(sp, ELS_LS_RJT, &els_data);
fc_frame_free(fp); fc_frame_free(fp);
return; return;
} }
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
mutex_unlock(&lport->disc.disc_mutex);
op = fc_frame_payload_op(fp); op = fc_frame_payload_op(fp);
switch (op) { switch (op) {