Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Arvind Yadav <arvind.yadav.cs@gmail.com>
To:     abbotti@mev.co.uk, hsweeten@visionengravers.com,
        gregkh@linuxfoundation.org
Cc:     linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org
Subject: [PATCH] staging: comedi: ni_atmio: Handle return value of  pnp_*
Date:   Thu, 16 Nov 2017 10:02:32 +0530
Message-Id: <35855327607952b24d97e7f7374a1115f400dd8c.1510806666.git.arvind.yadav.cs@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

pnp_irq() and pnp_port_start() can fail here and we must check
its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
 drivers/staging/comedi/drivers/ni_atmio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 2d62a8c..dead159 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -308,6 +308,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
 
 		iobase = pnp_port_start(isapnp_dev, 0);
 		irq = pnp_irq(isapnp_dev, 0);
+		if (irq == -1 || !iobase)
+			return -ENOMEM;
+
 		comedi_set_hw_dev(dev, &isapnp_dev->dev);
 	}
 
-- 
1.9.1


From 1586583469466696368@xxx Tue Dec 12 13:05:05 +0000 2017
X-GM-THRID: 1586582789684968283
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread