commit 5daa49ef05c44ce94bed0bab0f9ba4a9e952863b
Author: Linas Vepstas <[EMAIL PROTECTED]>
Date:   Thu Mar 8 16:19:11 2007 -0600

    [SCSI] lpfc: avoid double-free during PCI error failure
    
    If a PCI error is detected that cannot be recovered from, there
    will be a double call of lpfc_pci_remove_one(), with the second call
    resulting in a null-pointer dereference. The first call occurs in
    lpfc_io_error_detected(), and the second call during pci device
    remove. This patch eliminates the first call; its un-needed.
    
    Signed-off-by: Linas Vepstas <[EMAIL PROTECTED]>
    Acked-by: James Smart <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 
9d014e5a81c4ca438dce73dfde3d295acdbf166d..057fd7e0e379ae8a385d4f9e28c5ddf7c55a0c38
 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1817,10 +1817,9 @@ static pci_ers_result_t lpfc_io_error_de
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
 
-       if (state == pci_channel_io_perm_failure) {
-               lpfc_pci_remove_one(pdev);
+       if (state == pci_channel_io_perm_failure)
                return PCI_ERS_RESULT_DISCONNECT;
-       }
+
        pci_disable_device(pdev);
        /*
         * There may be I/Os dropped by the firmware.
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[EMAIL PROTECTED]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs

Reply via email to