From: Roel Kluin Date: Thu, 6 Aug 2009 13:06:03 +0000 (+0000) Subject: irda: fix read buffer overflow X-Git-Tag: v2.6.31-rc7~27^2~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d5ceb8bdde403529ad9849f300dc80b1884550f;p=platform%2Fkernel%2Flinux-stable.git irda: fix read buffer overflow io[i] is read before the bounds check on i, order should be reversed. Signed-off-by: Roel Kluin Cc: Samuel Ortiz Signed-off-by: Andrew Morton Signed-off-by: David S. Miller --- diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index d088383..fe4f2b2 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -115,7 +115,7 @@ static int __init w83977af_init(void) IRDA_DEBUG(0, "%s()\n", __func__ ); - for (i=0; (io[i] < 2000) && (i < ARRAY_SIZE(dev_self)); i++) { + for (i=0; i < ARRAY_SIZE(dev_self) && io[i] < 2000; i++) { if (w83977af_open(i, io[i], irq[i], dma[i]) == 0) return 0; }