The patch titled
Char: isicom, fix probe race
has been added to the -mm tree. Its filename is
char-isicom-fix-probe-race.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Char: isicom, fix probe race
From: Jiri Slaby <jirislaby@xxxxxxxxx>
Fix two race conditions in the probe function with mutex.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/isicom.c | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff -puN drivers/char/isicom.c~char-isicom-fix-probe-race drivers/char/isicom.c
--- a/drivers/char/isicom.c~char-isicom-fix-probe-race
+++ a/drivers/char/isicom.c
@@ -1732,22 +1732,25 @@ end:
/*
* Insmod can set static symbols so keep these static
*/
-static int card;
+static unsigned int card_count;
static int __devinit isicom_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+ const struct pci_device_id *ent)
{
+ static DEFINE_MUTEX(probe_lock);
unsigned int ioaddr, signature, index;
int retval = -EPERM;
- u8 pciirq;
struct isi_board *board = NULL;
- if (card >= BOARD_COUNT)
+ mutex_lock(&probe_lock);
+ if (card_count >= BOARD_COUNT) {
+ mutex_unlock(&probe_lock);
goto err;
+ }
+ card_count++;
ioaddr = pci_resource_start(pdev, 3);
/* i.e at offset 0x1c in the PCI configuration register space. */
- pciirq = pdev->irq;
dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
/* allot the first empty slot in the array */
@@ -1759,8 +1762,9 @@ static int __devinit isicom_probe(struct
board->index = index;
board->base = ioaddr;
- board->irq = pciirq;
- card++;
+ board->irq = pdev->irq;
+
+ mutex_unlock(&probe_lock);
pci_set_drvdata(pdev, board);
@@ -1770,7 +1774,7 @@ static int __devinit isicom_probe(struct
"will be disabled.\n", board->base, board->base + 15,
index + 1);
retval = -EBUSY;
- goto err;
+ goto err_dec;
}
retval = request_irq(board->irq, isicom_interrupt,
@@ -1799,8 +1803,10 @@ errunri:
free_irq(board->irq, board);
errunrr:
pci_release_region(pdev, 3);
-err:
+err_dec:
+ card_count--;
board->base = 0;
+err:
return retval;
}
@@ -1814,6 +1820,8 @@ static void __devexit isicom_remove(stru
free_irq(board->irq, board);
pci_release_region(pdev, 3);
+ card_count--;
+ board->base = 0;
}
static int __init isicom_init(void)
@@ -1821,8 +1829,6 @@ static int __init isicom_init(void)
int retval, idx, channel;
struct isi_port *port;
- card = 0;
-
for(idx = 0; idx < BOARD_COUNT; idx++) {
port = &isi_ports[idx * 16];
isi_card[idx].ports = port;
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
char-tty-delete-wake_up_interruptible-after-tty_wakeup.patch
char-isicom-remove-tty_hangwakeup-bottomhalves.patch
mxser-remove-ambiguous-redefinition-of-init_work.patch
char-isicom-fix-locking-in-isr.patch
char-isicom-fix-probe-race.patch
char-isicom-augment-card_reset.patch
char-isicom-check-card-state-in-isr.patch
char-isicom-support-higher-rates.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
