Skip to contentSkip to conversation

arm: mach-davinci: check irq2ctlr() result

PATCH Applied Kulikov Vasiliy 2 participants 2 messages Jul 17, 2010 – Aug 26, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 arm: mach-davinci: check irq2ctlr() result

If irq2ctlr() fails return IRQ_NONE.
Also as it can fail make 'ctlr' signed.

The semantic patch that finds this problem (many false-positive results):
(http://coccinelle.lip6.fr/)

// <smpl>
@ r1 @
identifier f;
@@
int f(...) { ... }

@@
identifier r1.f;
type T;
unsigned T x;
@@

*x = f(...)
...
*x > 0

---
 arch/arm/mach-davinci/dma.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/dma.c +6 -2
index d33827a..d1127e1 100644
@@ -344,10 +344,12 @@ static int irq2ctlr(int irq)
 static irqreturn_t dma_irq_handler(int irq, void *data)
 {
 	int i;
-	unsigned ctlr;
+	int ctlr;
 	unsigned int cnt = 0;
 
 	ctlr = irq2ctlr(irq);
+	if (ctlr < 0)
+		return IRQ_NONE;
 
 	dev_dbg(data, "dma_irq_handler\n");
 
@@ -398,10 +400,12 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
 static irqreturn_t dma_ccerr_handler(int irq, void *data)
 {
 	int i;
-	unsigned ctlr;
+	int ctlr;
 	unsigned int cnt = 0;
 
 	ctlr = irq2ctlr(irq);
+	if (ctlr < 0)
+		return IRQ_NONE;
 
 	dev_dbg(data, "dma_ccerr_handler\n");
 
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 2 lines · Kulikov Vasiliy

If irq2ctlr() fails return IRQ_NONE.
Also as it can fail make 'ctlr' signed.

[...]

Quoted 1 line

Sorry for the lag on this one.

Queueing for 2.6.37 in linux-davinci.git

Kevin