Skip to content

Commit aef4c08

Browse files
maurizio-lombardigregkh
authored andcommitted
scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats()
[ Upstream commit c2dd893a3b0772d1c680e109b9d5715d7f73022b ] If multiple tasks attempt to read the stats, it may happen that the start_req_done completion is re-initialized while still being used by another task, causing a list corruption. This patch fixes the bug by adding a mutex to serialize the calls to bnx2fc_get_host_stats(). WARNING: at lib/list_debug.c:48 list_del+0x6e/0xa0() (Not tainted) Hardware name: PowerEdge R820 list_del corruption. prev->next should be ffff882035627d90, but was ffff884069541588 Pid: 40267, comm: perl Not tainted 2.6.32-642.3.1.el6.x86_64 #1 Call Trace: [<ffffffff8107c691>] ? warn_slowpath_common+0x91/0xe0 [<ffffffff8107c796>] ? warn_slowpath_fmt+0x46/0x60 [<ffffffff812ad16e>] ? list_del+0x6e/0xa0 [<ffffffff81547eed>] ? wait_for_common+0x14d/0x180 [<ffffffff8106c4a0>] ? default_wake_function+0x0/0x20 [<ffffffff81547fd3>] ? wait_for_completion_timeout+0x13/0x20 [<ffffffffa05410b1>] ? bnx2fc_get_host_stats+0xa1/0x280 [bnx2fc] [<ffffffffa04cf630>] ? fc_stat_show+0x90/0xc0 [scsi_transport_fc] [<ffffffffa04cf8b6>] ? show_fcstat_tx_frames+0x16/0x20 [scsi_transport_fc] [<ffffffff8137c647>] ? dev_attr_show+0x27/0x50 [<ffffffff8113b9be>] ? __get_free_pages+0xe/0x50 [<ffffffff812170e1>] ? sysfs_read_file+0x111/0x200 [<ffffffff8119a305>] ? vfs_read+0xb5/0x1a0 [<ffffffff8119b0b6>] ? fget_light_pos+0x16/0x50 [<ffffffff8119a651>] ? sys_read+0x51/0xb0 [<ffffffff810ee1fe>] ? __audit_syscall_exit+0x25e/0x290 [<ffffffff8100b0d2>] ? system_call_fastpath+0x16/0x1b Signed-off-by: Maurizio Lombardi <[email protected]> Acked-by: Chad Dupuis <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 295042b commit aef4c08

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

drivers/scsi/bnx2fc/bnx2fc.h

+1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ struct bnx2fc_hba {
191191
struct bnx2fc_cmd_mgr *cmd_mgr;
192192
spinlock_t hba_lock;
193193
struct mutex hba_mutex;
194+
struct mutex hba_stats_mutex;
194195
unsigned long adapter_state;
195196
#define ADAPTER_STATE_UP 0
196197
#define ADAPTER_STATE_GOING_DOWN 1

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+8-2
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,17 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost)
641641
if (!fw_stats)
642642
return NULL;
643643

644+
mutex_lock(&hba->hba_stats_mutex);
645+
644646
bnx2fc_stats = fc_get_host_stats(shost);
645647

646648
init_completion(&hba->stat_req_done);
647649
if (bnx2fc_send_stat_req(hba))
648-
return bnx2fc_stats;
650+
goto unlock_stats_mutex;
649651
rc = wait_for_completion_timeout(&hba->stat_req_done, (2 * HZ));
650652
if (!rc) {
651653
BNX2FC_HBA_DBG(lport, "FW stat req timed out\n");
652-
return bnx2fc_stats;
654+
goto unlock_stats_mutex;
653655
}
654656
BNX2FC_STATS(hba, rx_stat2, fc_crc_cnt);
655657
bnx2fc_stats->invalid_crc_count += hba->bfw_stats.fc_crc_cnt;
@@ -671,6 +673,9 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost)
671673

672674
memcpy(&hba->prev_stats, hba->stats_buffer,
673675
sizeof(struct fcoe_statistics_params));
676+
677+
unlock_stats_mutex:
678+
mutex_unlock(&hba->hba_stats_mutex);
674679
return bnx2fc_stats;
675680
}
676681

@@ -1303,6 +1308,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
13031308
}
13041309
spin_lock_init(&hba->hba_lock);
13051310
mutex_init(&hba->hba_mutex);
1311+
mutex_init(&hba->hba_stats_mutex);
13061312

13071313
hba->cnic = cnic;
13081314

0 commit comments

Comments
 (0)