Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a803a74 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.42: Fixed using unsafe linked list macro for walking and deleting linked list 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 94cd65dd

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job) 
	struct lpfc_hba *phba = vport->phba;

	struct get_ct_event *event_req;

	struct get_ct_event_reply *event_reply;

	struct lpfc_bsg_event *evt;

	struct lpfc_bsg_event *evt, *evt_next;

	struct event_data *evt_dat = NULL;

	unsigned long flags;

	uint32_t rc = 0;
@@ -1269,7 +1269,7 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job) 
	event_reply = (struct get_ct_event_reply *)

		job->reply->reply_data.vendor_reply.vendor_rsp;

	spin_lock_irqsave(&phba->ct_ev_lock, flags);

	list_for_each_entry(evt, &phba->ct_ev_waiters, node) {

	list_for_each_entry_safe(evt, evt_next, &phba->ct_ev_waiters, node) {

		if (evt->reg_id == event_req->ev_reg_id) {

			if (list_empty(&evt->events_to_get))

				break;

drivers/scsi/lpfc/lpfc_sli.c

+3 −2
Original line number Diff line number Diff line
@@ -15808,7 +15808,7 @@ lpfc_sli4_fcf_rr_index_set(struct lpfc_hba *phba, uint16_t fcf_index) 
void

lpfc_sli4_fcf_rr_index_clear(struct lpfc_hba *phba, uint16_t fcf_index)

{

	struct lpfc_fcf_pri *fcf_pri;

	struct lpfc_fcf_pri *fcf_pri, *fcf_pri_next;

	if (fcf_index >= LPFC_SLI4_FCF_TBL_INDX_MAX) {

		lpfc_printf_log(phba, KERN_ERR, LOG_FIP,

				"2762 FCF (x%x) reached driver's book "
@@ -15818,7 +15818,8 @@ lpfc_sli4_fcf_rr_index_clear(struct lpfc_hba *phba, uint16_t fcf_index) 
	}

	/* Clear the eligible FCF record index bmask */

	spin_lock_irq(&phba->hbalock);

	list_for_each_entry(fcf_pri, &phba->fcf.fcf_pri_list, list) {

	list_for_each_entry_safe(fcf_pri, fcf_pri_next, &phba->fcf.fcf_pri_list,

				 list) {

		if (fcf_pri->fcf_rec.fcf_index == fcf_index) {

			list_del_init(&fcf_pri->list);

			break;