diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2013-08-16 23:48:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-20 13:27:28 -0700 |
| commit | 18ebe5c1c63b46f1acc41f68af5d82d6b7b39d73 (patch) | |
| tree | c35d67ceb9594d9de35eab88ac011aacc796fd1d /drivers/net/irda | |
| parent | e5733321d5a94cc9a202ea85c4aabe09571217e6 (diff) | |
| download | linux-18ebe5c1c63b46f1acc41f68af5d82d6b7b39d73.tar.gz linux-18ebe5c1c63b46f1acc41f68af5d82d6b7b39d73.tar.bz2 linux-18ebe5c1c63b46f1acc41f68af5d82d6b7b39d73.zip | |
via-ircc: don't return zero if via_ircc_open() failed
If via_ircc_open() fails, data structures of the driver left uninitialized,
but probe (via_init_one()) returns zero. That can lead to null pointer dereference
in via_remove_one(), since it does not check drvdata for NULL.
The patch implements proper error code propagation.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/via-ircc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 51f2bc376101..2dcc60fb37f1 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c @@ -210,8 +210,7 @@ static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) pci_write_config_byte(pcidev,0x42,(bTmp | 0xf0)); pci_write_config_byte(pcidev,0x5a,0xc0); WriteLPCReg(0x28, 0x70 ); - if (via_ircc_open(pcidev, &info, 0x3076) == 0) - rc=0; + rc = via_ircc_open(pcidev, &info, 0x3076); } else rc = -ENODEV; //IR not turn on } else { //Not VT1211 @@ -249,8 +248,7 @@ static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) info.irq=FirIRQ; info.dma=FirDRQ1; info.dma2=FirDRQ0; - if (via_ircc_open(pcidev, &info, 0x3096) == 0) - rc=0; + rc = via_ircc_open(pcidev, &info, 0x3096); } else rc = -ENODEV; //IR not turn on !!!!! }//Not VT1211 |